You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/03/18 08:33:59 UTC

git commit: ISIS-749: less noisy logging

Repository: isis
Updated Branches:
  refs/heads/master 472811c59 -> 1fcec5fa0


ISIS-749: less noisy logging

in AdapterManagerDefault, ResourceServlet


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1fcec5fa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1fcec5fa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1fcec5fa

Branch: refs/heads/master
Commit: 1fcec5fa0befa8d790eec8baefc7c89cb8f727fb
Parents: 472811c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Mar 18 07:33:42 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Mar 18 07:33:42 2014 +0000

----------------------------------------------------------------------
 .../org/apache/isis/core/webapp/content/ResourceServlet.java  | 4 ++--
 .../persistence/adaptermanager/AdapterManagerDefault.java     | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/1fcec5fa/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java b/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
index 43a0a10..56d65d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
@@ -53,8 +53,8 @@ public class ResourceServlet extends HttpServlet {
 
     private void processRequest(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
         final String servletPath = StringExtensions.stripLeadingSlash(request.getServletPath());
-        if (LOG.isInfoEnabled()) {
-            LOG.info("request: " + servletPath);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("request: " + servletPath);
         }
 
         // try to load from filesystem

http://git-wip-us.apache.org/repos/asf/isis/blob/1fcec5fa/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
index dbfc2df..b98fac6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
@@ -338,15 +338,16 @@ public class AdapterManagerDefault implements AdapterManagerSpi {
                     }
                 }
             } finally {
-                
                 final Version originalVersion = originalOid.getVersion();
                 final Version recreatedVersion = recreatedOid.getVersion();
                 if(recreatedVersion != null && (
                         originalVersion == null || 
                         recreatedVersion.different(originalVersion))
                     ) {
-                   LOG.info("updating version in oid, on " + originalOid + " (" + originalVersion + ") to (" + recreatedVersion +")");
-                   originalOid.setVersion(recreatedVersion);
+                    if(LOG.isDebugEnabled()) {
+                        LOG.debug("updating version in oid, on " + originalOid + " (" + originalVersion + ") to (" + recreatedVersion +")");
+                    }
+                    originalOid.setVersion(recreatedVersion);
                 }
             }
         }