svn commit: r1308792 - /ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1308792 - /ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java

jleroux@apache.org
Author: jleroux
Date: Tue Apr  3 09:48:28 2012
New Revision: 1308792

URL: http://svn.apache.org/viewvc?rev=1308792&view=rev
Log:
Reverts r1308078 http://svn.apache.org/viewvc?view=revision&revision=1308078 due to some pressure on this commit http://markmail.org/message/zqguh6ttd2a5jqcb
And even if I'm quite sure it's not harmful, I don't see either a great need for it

Modified:
    ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java

Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java?rev=1308792&r1=1308791&r2=1308792&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java (original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java Tue Apr  3 09:48:28 2012
@@ -37,7 +37,7 @@ import java.util.List;
  *
  */
 public class Start {
- private static final String DEBUG = System.getProperty("DEBUG");
+
     private static final String SHUTDOWN_COMMAND = "SHUTDOWN";
     private static final String STATUS_COMMAND = "STATUS";
 
@@ -206,7 +206,7 @@ public class Start {
         System.setProperty("java.class.path", classPath.toString());
         ClassLoader classloader = classPath.getClassLoader();
         Thread.currentThread().setContextClassLoader(classloader);
-        if (DEBUG != null) {
+        if (System.getProperty("DEBUG") != null) {
             System.out.println("Startup Classloader: " + classloader.toString());
             System.out.println("Startup Classpath: " + classPath.toString());
         }
@@ -310,12 +310,7 @@ public class Start {
                     loader.start();
                 } catch (StartupException e) {
                     e.printStackTrace();
-                    if (DEBUG == null)
-                        return false;
-                } catch(Error e) {
-                    e.printStackTrace();
-                    if (DEBUG == null)
-                        return false;
+                    return false;
                 }
             }
             serverStarted = true;