You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/06/01 10:00:40 UTC

svn commit: r1682829 - /myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/activity/ActivityList.java

Author: lofwyr
Date: Mon Jun  1 08:00:40 2015
New Revision: 1682829

URL: http://svn.apache.org/r1682829
Log:
fixing broken merge

Modified:
    myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/activity/ActivityList.java

Modified: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/activity/ActivityList.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/activity/ActivityList.java?rev=1682829&r1=1682828&r2=1682829&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/activity/ActivityList.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/activity/ActivityList.java Mon Jun  1 08:00:40 2015
@@ -53,12 +53,12 @@ public class ActivityList {
     return result;
   }
 
- public void jsfRequest(String sessionId) {
+  public void jsfRequest(String sessionId) {
     final Activity activity = data.get(sessionId);
     if (activity != null) {
       activity.jsfRequest();
     } else {
-      LOG.error("Ignoring sessionId='{}'", sessionId);
+      LOG.error("Ignoring sessionId='" + sessionId + "'");
     }
   }
 
@@ -67,7 +67,7 @@ public class ActivityList {
     if (activity != null) {
       activity.ajaxRequest();
     } else {
-      LOG.error("Ignoring sessionId='{}'", sessionId);
+      LOG.error("Ignoring sessionId='" + sessionId + "'");
     }
   }
-}}
+}