svn commit: r1718635 - /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java

[cz...@apache.org]

Author: cziegeler
Date: Tue Dec  8 15:41:55 2015
New Revision: 1718635

URL: http://svn.apache.org/viewvc?rev=1718635&view=rev
Log:
SLING-5366 : Wrong handling of bundle/service ref object in SlingLogger

Modified:
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java

Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java?rev=1718635&r1=1718634&r2=1718635&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java (original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java Tue Dec  8 15:41:55 2015
@@ -107,19 +107,23 @@ public class MainDelegate implements Lau
 
     private Sling sling;
 
+    @Override
     public void setNotifiable(Notifiable notifiable) {
         this.notifiable = notifiable;
     }
 
+    @Override
     public void setCommandLine(Map<String, String> args) {
         commandLine = new HashMap<String, String>();
         parseCommandLine(args, commandLine);
     }
 
+    @Override
     public void setSlingHome(String slingHome) {
         this.slingHome = slingHome;
     }
 
+    @Override
     public boolean start() {
 
         Map<String, String> props = new HashMap<String, String>();
@@ -181,6 +185,7 @@ public class MainDelegate implements Lau
                 // overwrite the loadPropertiesOverride method to inject the
                 // command line arguments unconditionally. These will not be
                 // persisted in any properties file, though
+                @Override
                 protected void loadPropertiesOverride(
                         Map<String, String> properties) {
                     if (commandLine != null) {
@@ -205,6 +210,7 @@ public class MainDelegate implements Lau
         return false;
     }
 
+    @Override
     public void stop() {
         if (sling != null) {
             sling.destroy();
@@ -388,20 +394,33 @@ public class MainDelegate implements Lau
                 throwable = ((BundleException) throwable).getNestedException();
             }
 
-            String s = (sr == null) ? null : "SvcRef " + sr;
-            s = (s == null) ? null : s + " Bundle '" + bundle.getBundleId() + "'";
-            s = (s == null) ? msg : s + " " + msg;
-            s = (throwable == null) ? s : s + " (" + throwable + ")";
+            final StringBuilder sb = new StringBuilder();
+            if (sr != null) {
+                sb.append("SvcRef ");
+                sb.append(sr);
+                sb.append(" ");
+            } else if (bundle != null) {
+                sb.append("Bundle '");
+                sb.append(String.valueOf(bundle.getBundleId()));
+                sb.append("' ");
+            }
+            sb.append(msg);
+            if ( throwable != null ) {
+                sb.append(" (");
+                sb.append(throwable);
+                sb.append(")");
+            }
+            final String s = sb.toString();
 
             switch (level) {
                 case LOG_DEBUG:
                     debug("DEBUG: " + s);
                     break;
                 case LOG_INFO:
-                    info("INFO: " + s, null);
+                    info("INFO: " + s, throwable);
                     break;
                 case LOG_WARNING:
-                    warn("WARNING: " + s, null);
+                    warn("WARNING: " + s, throwable);
                     break;
                 case LOG_ERROR:
                     error("ERROR: " + s, throwable);