Fix #309 and JDWP version downgrade to 1.5 (#315)

* fixed #309 Cannot Use Step Filters while Debugging in Eclipse * EXCEPTION_ONLY validation fixed (root case) * JDWP version downgraded to 1.5 as Eclipse uses features that are not supported * robovm.version set to 2.3.5-SNAPSHOT * fixed spelling as per #311 (review)
MobiVM · Jul 7, 2018 · d152b61 · d152b61
1 parent a973a07
commit d152b61
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/compiler/rt/libcore/luni/src/main/java/java/text/DecimalFormatSymbols.java b/compiler/rt/libcore/luni/src/main/java/java/text/DecimalFormatSymbols.java
@@ -98,8 +98,8 @@ public DecimalFormatSymbols(Locale locale) {
         try {
             currency = Currency.getInstance(locale);
             if (currency == null) {
-                // dkimitsa: for some countries there is no currecy like Antarctida AQ so pick currency
-                // directcly by no currency code
+                // dkimitsa: for some countries there is no currency like Antarctida AQ so pick currency
+                // directly by no currency code
                 currency = Currency.getInstance("XXX");
             }
             currencySymbol = currency.getSymbol(locale);

diff --git a/plugins/debugger/src/main/java/org/robovm/debugger/delegates/JdwpEventCenterDelegate.java b/plugins/debugger/src/main/java/org/robovm/debugger/delegates/JdwpEventCenterDelegate.java
@@ -179,7 +179,7 @@ public int jdwpSetEventRequest(byte eventKind, byte suspendPolicy, List<EventPre
 
                 case JdwpConsts.EventModifier.EXCEPTION_ONLY:
                     itemId = ((EventExceptionPredicate) predicate).refTypeId();
-                    if (delegates.state().classRefIdHolder().objectById(itemId) == null)
+                    if (itemId != 0 && delegates.state().classRefIdHolder().objectById(itemId) == null)
                         throw new DebuggerException(JdwpConsts.Error.INVALID_CLASS);
                     break;
 

diff --git a/...gger/src/main/java/org/robovm/debugger/jdwp/handlers/vm/JdwpVmCapabilitiesNewHandler.java b/...gger/src/main/java/org/robovm/debugger/jdwp/handlers/vm/JdwpVmCapabilitiesNewHandler.java
@@ -75,22 +75,22 @@ public short handle(ByteBufferPacket payload, ByteBufferPacket output) {
         //canSetDefaultStratum: Can the VM set a default stratum?
         output.writeBoolean(false);
 
-        //canGetInstanceInfo: Can the VM return instances, counts of instances of classes and referring objects?
+        //reserved16: Reserved for future capability
         output.writeBoolean(false);
 
-        //canRequestMonitorEvents: Can the VM request monitor events?
+        //reserved17: Reserved for future capability
         output.writeBoolean(false);
 
-        //canGetMonitorFrameInfo: Can the VM get monitors with frame depth info?
+        //reserved18: Reserved for future capability
         output.writeBoolean(false);
 
-        //canUseSourceNameFilters: Can the VM filter class prepare events by source name?
+        //reserved19: Reserved for future capability
         output.writeBoolean(false);
 
-        //canGetConstantPool: Can the VM return the constant pool information?
+        //reserved20: Reserved for future capability
         output.writeBoolean(false);
 
-        //canForceEarlyReturn: Can the VM force early return from a method?
+        //reserved21: Reserved for future capability
         output.writeBoolean(false);
 
         //reserved22: Reserved for future capability

diff --git a/plugins/debugger/src/main/java/org/robovm/debugger/state/VmSpecConsts.java b/plugins/debugger/src/main/java/org/robovm/debugger/state/VmSpecConsts.java
@@ -23,10 +23,10 @@ public class VmSpecConsts {
     // VM name as reported by JDWP
     public static final String JDWP_NAME = "RoboVM.Debugger";
 
-    // suppose 1.6 set of commands is implemented
-    // http://docs.oracle.com/javase/6/docs/platform/jpda/jdwp/jdwp-protocol.html
+    // suppose 1.5 set of commands is implemented
+    // https://docs.oracle.com/javase/1.5.0/docs/guide/jpda/jdwp/jdwp-protocol.html
     public static final int JDWP_VERSION_MAJOR = 1;
-    public static final int JDWP_VERSION_MINOR = 6;
+    public static final int JDWP_VERSION_MINOR = 5;
 
     // java VM version
     public static final String JAVA_VM_VERSION = "1.8_RoboVM";

diff --git a/plugins/eclipse/ui/pom.xml b/plugins/eclipse/ui/pom.xml
@@ -13,7 +13,7 @@
   <packaging>eclipse-plugin</packaging>
 
   <properties>
-    <robovm.version>2.3.4</robovm.version>
+    <robovm.version>2.3.5-SNAPSHOT</robovm.version>
   </properties>
 
   <dependencyManagement>