Merge remote-tracking branch 'origin/master' into jetty-8

4 files changed, 14 insertions, 9 deletions

diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
index 0cb29ccc7c..fb8e1a5d36 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
@@ -481,7 +481,7 @@ public class DeploymentManager extends AggregateLifeCycle
                 while (it.hasNext())
                 {
                     Node node = it.next();
-                    LOG.debug("Executing Node: " + node);
+                    LOG.debug("Executing Node {}",node);
                     _lifecycle.runBindings(node,appentry.app,this);
                     appentry.setLifeCycleNode(node);
                 }
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
index 81e641cbfd..6cbb2d6fc3 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
@@ -257,7 +257,7 @@ public class WebAppDeployer extends AbstractLifeCycle
 
                         if (path != null && path.equals(app.getFile().getCanonicalPath()))
                         {
-                            LOG.debug("Already deployed:"+path);
+                            LOG.debug("Already deployed: {}",path);
                             continue files;
                         }
                     }
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardUndeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardUndeployer.java
index 0a5c08c6bd..c7119dafd3 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardUndeployer.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/StandardUndeployer.java
@@ -51,13 +51,14 @@ public class StandardUndeployer implements AppLifeCycle.Binding
         for (int i = 0, n = children.length; i < n; i++)
         {
             Handler child = children[i];
-            LOG.debug("Child handler: " + child);
+            LOG.debug("Child handler {}",child);
             if (child.equals(context))
             {
-                LOG.debug("Removing handler: " + child);
+                LOG.debug("Removing handler {}",child);
                 coll.removeHandler(child);
                 child.destroy();
-                LOG.debug(String.format("After removal: %d (originally %d)",coll.getHandlers().length,originalCount));
+                if (LOG.isDebugEnabled())
+                    LOG.debug("After removal: {} (originally {})",coll.getHandlers().length,originalCount);
             }
             else if (child instanceof HandlerCollection)
             {
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java
index 629f13f92e..8bf03f30a1 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java
@@ -99,7 +99,8 @@ public abstract class ScanningAppProvider extends AbstractLifeCycle implements A
     @Override
     protected void doStart() throws Exception
     {
-        if (LOG.isDebugEnabled()) LOG.debug(this.getClass().getSimpleName() + ".doStart()");
+        if (LOG.isDebugEnabled()) 
+            LOG.debug(this.getClass().getSimpleName() + ".doStart()");
         if (_monitoredDir == null)
         {
             throw new IllegalStateException("No configuration dir specified");
@@ -132,7 +133,8 @@ public abstract class ScanningAppProvider extends AbstractLifeCycle implements A
     /* ------------------------------------------------------------ */
     protected void fileAdded(String filename) throws Exception
     {
-        if (LOG.isDebugEnabled()) LOG.debug("added ",filename);
+        if (LOG.isDebugEnabled()) 
+            LOG.debug("added {}",filename);
         App app = ScanningAppProvider.this.createApp(filename);
         if (app != null)
         {
@@ -144,7 +146,8 @@ public abstract class ScanningAppProvider extends AbstractLifeCycle implements A
     /* ------------------------------------------------------------ */
     protected void fileChanged(String filename) throws Exception
     {
-        if (LOG.isDebugEnabled()) LOG.debug("changed ",filename);
+        if (LOG.isDebugEnabled()) 
+            LOG.debug("changed {}",filename);
         App app = _appMap.remove(filename);
         if (app != null)
         {
@@ -161,7 +164,8 @@ public abstract class ScanningAppProvider extends AbstractLifeCycle implements A
     /* ------------------------------------------------------------ */
     protected void fileRemoved(String filename) throws Exception
     {
-        if (LOG.isDebugEnabled()) LOG.debug("removed ",filename);
+        if (LOG.isDebugEnabled()) 
+            LOG.debug("removed {}",filename);
         App app = _appMap.remove(filename);
         if (app != null)
             _deploymentManager.removeApp(app);