use unboxed primitives everywhere possible for reliable == behavior

4 files changed, 12 insertions, 12 deletions

diff --git a/nailgun_launcher/CbtURLClassLoader.java b/nailgun_launcher/CbtURLClassLoader.java
index fac7050..bf698b0 100644
--- a/nailgun_launcher/CbtURLClassLoader.java
+++ b/nailgun_launcher/CbtURLClassLoader.java
@@ -21,7 +21,7 @@ public class CbtURLClassLoader extends java.net.URLClassLoader{
     if(_class == null) throw new ClassNotFoundException(name);
     else return _class;
   }
-  public Class loadClass(String name, Boolean resolve) throws ClassNotFoundException{
+  public Class loadClass(String name, boolean resolve) throws ClassNotFoundException{
     //System.out.println("loadClass("+name+") on \n"+this);
     synchronized( cache ){
       if(!cache.containsKey(name))
@@ -32,7 +32,7 @@ public class CbtURLClassLoader extends java.net.URLClassLoader{
         }
       Class _class = cache.get(name);
       if(_class == Object.class){
-        if( name == "java.lang.Object" )
+        if( name.equals("java.lang.Object") )
           return Object.class;
         else return null;
       } else {
diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java
index 8a330d8..93c28f3 100644
--- a/nailgun_launcher/NailgunLauncher.java
+++ b/nailgun_launcher/NailgunLauncher.java
@@ -46,7 +46,7 @@ public class NailgunLauncher{
   public static long nailgunLauncherLastModified = -1; // this initial value should be overwritten, never read
 
   public static void main( String[] args ) throws Throwable {
-    Long _start = System.currentTimeMillis();
+    long _start = System.currentTimeMillis();
     if(args[0].equals("check-alive")){
       System.exit(33);
       return;
@@ -62,13 +62,13 @@ public class NailgunLauncher{
     // scala.Console, which captured them at startup
     try{
       System.out.getClass().getDeclaredField("streams"); // nailgun ThreadLocalPrintStream
-      assert(System.out.getClass().getName() == "com.martiansoftware.nailgun.ThreadLocalPrintStream");
+      assert(System.out.getClass().getName().equals("com.martiansoftware.nailgun.ThreadLocalPrintStream"));
     } catch( NoSuchFieldException e ){
       System.setOut( new PrintStream(new ThreadLocalOutputStream(System.out), true) );
     }
     try{
       System.err.getClass().getDeclaredField("streams"); // nailgun ThreadLocalPrintStream
-      assert(System.err.getClass().getName() == "com.martiansoftware.nailgun.ThreadLocalPrintStream");
+      assert(System.err.getClass().getName().equals("com.martiansoftware.nailgun.ThreadLocalPrintStream"));
     } catch( NoSuchFieldException e ){
       System.setErr( new PrintStream(new ThreadLocalOutputStream(System.err), true) );
     }
@@ -93,7 +93,7 @@ public class NailgunLauncher{
     );
 
     try{
-      Integer exitCode = (Integer) res
+      int exitCode = (int) res
         .classLoader
         .loadClass("cbt.Stage1")
         .getMethod(
diff --git a/nailgun_launcher/Stage0Lib.java b/nailgun_launcher/Stage0Lib.java
index 425ced3..8237c3c 100644
--- a/nailgun_launcher/Stage0Lib.java
+++ b/nailgun_launcher/Stage0Lib.java
@@ -14,14 +14,14 @@ import java.nio.file.attribute.FileTime;
 import static java.lang.Math.min;
 
 public class Stage0Lib{
-  public static void _assert(Boolean condition, Object msg){
+  public static void _assert(boolean condition, Object msg){
     if(!condition){
       throw new AssertionError("Assertion failed: "+msg);
     }
   }
 
   public static int runMain(String cls, String[] args, ClassLoader cl) throws Throwable{
-    Boolean trapExitCodeBefore = TrapSecurityManager.trapExitCode().get();
+    boolean trapExitCodeBefore = TrapSecurityManager.trapExitCode().get();
     try{
       TrapSecurityManager.trapExitCode().set(true);
       cl.loadClass(cls)
@@ -152,7 +152,7 @@ public class Stage0Lib{
 
   private static String getVarFromEnv(String envKey) {
     String value = System.getenv(envKey);
-    if(value==null || value.isEmpty()) {
+    if(value == null || value.isEmpty()) {
       value = System.getenv(envKey.toUpperCase());
     }
     return value;
@@ -161,7 +161,7 @@ public class Stage0Lib{
   private static void setProxyfromPropOrEnv(String envKey, String propKeyH, String propKeyP) {
     String proxyHost = System.getProperty(propKeyH);
     String proxyPort = System.getProperty(propKeyP);
-    if((proxyHost==null || proxyHost.isEmpty()) && (proxyPort==null || proxyPort.isEmpty())) {
+    if((proxyHost == null || proxyHost.isEmpty()) && (proxyPort == null || proxyPort.isEmpty())) {
       String envVar = getVarFromEnv(envKey);
       if(envVar != null && !envVar.isEmpty()) {
         String[] proxy = envVar.replaceFirst("^https?://", "").split(":", 2);
@@ -175,7 +175,7 @@ public class Stage0Lib{
     setProxyfromPropOrEnv("http_proxy", "http.proxyHost", "http.proxyPort");
     setProxyfromPropOrEnv("https_proxy", "https.proxyHost", "https.proxyPort");
     String nonHosts = System.getProperty("http.nonProxyHosts");
-    if(nonHosts==null || nonHosts.isEmpty()) {
+    if(nonHosts == null || nonHosts.isEmpty()) {
       String envVar = getVarFromEnv("no_proxy");
       if(envVar != null && !envVar.isEmpty()) {
         System.setProperty("http.nonProxyHosts", envVar.replaceAll(",","|"));
diff --git a/nailgun_launcher/TrapSecurityManager.java b/nailgun_launcher/TrapSecurityManager.java
index 48e152b..be59671 100644
--- a/nailgun_launcher/TrapSecurityManager.java
+++ b/nailgun_launcher/TrapSecurityManager.java
@@ -39,7 +39,7 @@ public class TrapSecurityManager extends ProxySecurityManager{
   public TrapSecurityManager(){
     super(NailgunLauncher.initialSecurityManager);
   }
-  
+
   public void checkPermission( Permission permission ){
     /*
     NOTE: is it actually ok, to just make these empty?