[GR-4069] Fix getAllOptions fails with NPE.

argan · Jul 14, 2017 · 9ed9a01 · 9ed9a01
2 parents a37b749 + f506583
commit 9ed9a01
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/truffle/src/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngineImpl.java b/truffle/src/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngineImpl.java
@@ -350,10 +350,6 @@ private static RuntimeException failDuplicateId(String duplicateId, String class
                                         duplicateId, className1, className2));
     }
 
-    private PolyglotInstrumentImpl getData(Instrument language) {
-        return (PolyglotInstrumentImpl) impl.getAPIAccess().getImpl(language);
-    }
-
     final void checkState() {
         if (closed) {
             throw new IllegalStateException("Engine is already closed.");
@@ -481,8 +477,8 @@ OptionDescriptors getAllOptions() {
                     for (PolyglotLanguageImpl language : idToLanguage.values()) {
                         allDescriptors.add(language.getOptions());
                     }
-                    for (Instrument instrument : idToPublicInstrument.values()) {
-                        allDescriptors.add(getData(instrument).getOptions());
+                    for (PolyglotInstrumentImpl instrument : idToInstrument.values()) {
+                        allDescriptors.add(instrument.getOptions());
                     }
                     allOptions = OptionDescriptors.createUnion(allDescriptors.toArray(new OptionDescriptors[0]));
                 }