jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r650357 - /jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
Date Tue, 22 Apr 2008 02:06:48 GMT
Author: jukka
Date: Mon Apr 21 19:06:46 2008
New Revision: 650357

URL: http://svn.apache.org/viewvc?rev=650357&view=rev
Log:
1.4: Removed conflict artifacts and IOUtils references

Modified:
    jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java?rev=650357&r1=650356&r2=650357&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
Mon Apr 21 19:06:46 2008
@@ -1180,7 +1180,7 @@
             }
             return bytes;
         } finally {
-            IOUtils.closeQuietly(in);
+            closeStream(in);
         }
     }
 
@@ -1476,16 +1476,9 @@
         if (message != null) {
             log.error(message);
         }
-<<<<<<< .working
-        log.error("       Reason: " + se.getMessage());
-        log.error("   State/Code: " + se.getSQLState() + "/" +
-                se.getErrorCode());
-        log.debug("   dump:", se);
-=======
         log.error("       Reason: " + e.getMessage());
         log.error("   State/Code: " + e.getSQLState() + "/" + e.getErrorCode());
         log.debug("   dump:", e);
->>>>>>> .merge-right.r649733
     }
 
     /**
@@ -1661,13 +1654,10 @@
         }
     }
 
-<<<<<<< .working
-=======
     /**
      * Iterator over an in-memory list of node ids.
      * This helper class is used by {@link BundleDbPersistenceManager#getAllNodeIds}.
      */
->>>>>>> .merge-right.r649733
     private class ListNodeIdIterator implements NodeIdIterator {
         
         private final ArrayList list;



Mime
View raw message