svn commit: r1765649 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document: CommitDiff.java DocumentNodeStore.java

[chetanm]

Author: chetanm
Date: Wed Oct 19 15:12:25 2016
New Revision: 1765649

URL: http://svn.apache.org/viewvc?rev=1765649&view=rev
Log:
OAK-1312 -  [bundling] Bundle nodes into a document

Changes per Marcel's feedback
- Make exception part of log message
- Do away with getBundlingHandler on DocumentNodeStore

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java?rev=1765649&r1=1765648&r2=1765649&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java
 Wed Oct 19 15:12:25 2016
@@ -51,7 +51,7 @@ class CommitDiff implements NodeStateDif
 
     CommitDiff(@Nonnull DocumentNodeStore store, @Nonnull Commit commit,
                @Nonnull BlobSerializer blobs) {
-        this(checkNotNull(store), checkNotNull(commit), 
store.getBundlingHandler(),
+        this(checkNotNull(store), checkNotNull(commit), 
store.getBundlingConfigHandler().newBundlingHandler(),
                 new JsopBuilder(), checkNotNull(blobs));
     }
 

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1765649&r1=1765648&r2=1765649&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 Wed Oct 19 15:12:25 2016
@@ -621,7 +621,7 @@ public final class DocumentNodeStore
         try {
             bundlingConfigHandler.close();
         } catch (IOException e) {
-            LOG.warn("Error closing bundlingConfigHandler", 
bundlingConfigHandler);
+            LOG.warn("Error closing bundlingConfigHandler", 
bundlingConfigHandler, e);
         }
 
         // notify background threads waiting on isDisposed
@@ -1126,10 +1126,6 @@ public final class DocumentNodeStore
         return result;
     }
 
-    public BundlingHandler getBundlingHandler() {
-        return bundlingConfigHandler.newBundlingHandler();
-    }
-
     public BundlingConfigHandler getBundlingConfigHandler() {
         return bundlingConfigHandler;
     }