From 1d837a835c04078ec66325e9fb9de21ac401874e Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Wed, 30 Nov 2016 15:10:15 +0700
Subject: prevent string concatenation for disabled loggers

---
 .../java/com/juick/components/s2s/ConnectionRouter.java   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java')

diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java
index 5af00329..9272a3d0 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionRouter.java
@@ -30,7 +30,6 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /**
- *
  * @author ugnich
  */
 public class ConnectionRouter extends Connection implements Runnable {
@@ -100,7 +99,7 @@ public class ConnectionRouter extends Connection implements Runnable {
                                 if (jid.Host.equals(componentName)) {
                                     if (tag.equals("message")) {
                                         Message xmsg = Message.parse(parser, xmpp.childParsers);
-                                        logger.info("STREAM ROUTER (PROCESS): " + xmsg.toString());
+                                        logger.info("STREAM ROUTER (PROCESS): {}", xmsg);
                                         JuickMessage jmsg = (JuickMessage) xmsg.getChild(JuickMessage.XMLNS);
                                         if (jmsg != null) {
                                             if (jid.Username != null && jid.Username.equals("recomm")) {
@@ -116,23 +115,25 @@ public class ConnectionRouter extends Connection implements Runnable {
                                     }
                                 } else if (jid.Host.endsWith(xmpp.HOSTNAME) && (jid.Host.equals(xmpp.HOSTNAME) || jid.Host.endsWith("." + xmpp.HOSTNAME))) {
                                     String xml = XmlUtils.parseToString(parser, true);
-                                    logger.info("STREAM ROUTER: " + xml);
+                                    logger.info("STREAM ROUTER: {}", xml);
                                 } else {
                                     String xml = XmlUtils.parseToString(parser, true);
-                                    logger.info("STREAM ROUTER (OUT): " + xml);
+                                    logger.info("STREAM ROUTER (OUT): {}", xml);
                                     xmpp.sendOut(jid.Host, xml);
                                 }
                             } else {
-                                logger.info("STREAM ROUTER (NO TO): " + XmlUtils.parseToString(parser, true));
+                                if (logger.isInfoEnabled()) // prevent parseToString for disabled logs
+                                    logger.info("STREAM ROUTER (NO TO): {}", XmlUtils.parseToString(parser, true));
                             }
                         } else {
-                            logger.info("STREAM ROUTER: " + XmlUtils.parseToString(parser, true));
+                            if (logger.isInfoEnabled()) // prevent parseToString for disabled logs
+                                logger.info("STREAM ROUTER: {}", XmlUtils.parseToString(parser, true));
                         }
                     }
 
                     logger.warn("STREAM ROUTER FINISHED");
                 } catch (Exception e) {
-                    logger.warn("router error, reconnection " + e.toString());
+                    logger.warn("router error, reconnection ", e);
                     execution.recordFailure(e);
                 }
             }
-- 
cgit v1.2.3