svn commit: r1740613 - in /jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment: SegmentBufferWriter.java file/FileStore.java

[mduerig]

Author: mduerig
Date: Fri Apr 22 22:35:22 2016
New Revision: 1740613

URL: http://svn.apache.org/viewvc?rev=1740613&view=rev
Log:
OAK-3348: Cross gc sessions might introduce references to pre-compacted segments
Unused catch parameters

Modified:
    
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
    
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java

Modified: 
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java?rev=1740613&r1=1740612&r2=1740613&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
 Fri Apr 22 22:35:22 2016
@@ -182,7 +182,7 @@ public class SegmentBufferWriter impleme
             byte[] data = metaInfo.getBytes(UTF_8);
             RecordWriters.newValueWriter(data.length, data).write(this);
         } catch (IOException e) {
-            LOG.error("Unable to write meta info to segment {} {}", 
segment.getSegmentId(), metaInfo);
+            LOG.error("Unable to write meta info to segment {} {}", 
segment.getSegmentId(), metaInfo, e);
         }
     }
 

Modified: 
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1740613&r1=1740612&r2=1740613&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
 Fri Apr 22 22:35:22 2016
@@ -468,7 +468,7 @@ public class FileStore implements Segmen
                     } else {
                         log.warn("Unable to access revision {}, rewinding...", 
last);
                     }
-                } catch (IllegalArgumentException e) {
+                } catch (IllegalArgumentException ignore) {
                     log.warn("Skipping invalid record id {}", head);
                 }
             }