svn commit: r1689362 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/...

[mduerig]

Author: mduerig
Date: Mon Jul  6 10:37:58 2015
New Revision: 1689362

URL: http://svn.apache.org/r1689362
Log:
OAK-3074: FileStore.size doesn't throw IOException but declares it as thrown
Remove throws clause

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
    
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1689362&r1=1689361&r2=1689362&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
 Mon Jul  6 10:37:58 2015
@@ -559,7 +559,7 @@ public class FileStore implements Segmen
         return dataFiles;
     }
 
-    public synchronized long size() throws IOException {
+    public synchronized long size() {
         long size = writeFile.length();
         for (TarReader reader : readers) {
             size += reader.size();

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java?rev=1689362&r1=1689361&r2=1689362&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
 Mon Jul  6 10:37:58 2015
@@ -67,6 +67,7 @@ import com.google.common.util.concurrent
 import com.google.common.util.concurrent.ListenableScheduledFuture;
 import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 import org.apache.jackrabbit.oak.api.Blob;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
 import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy;
@@ -365,7 +366,7 @@ public class SegmentCompactionIT {
         }
 
         @Override
-        public Void call() throws Exception {
+        public Void call() throws IOException, CommitFailedException {
             NodeBuilder root = nodeStore.getRoot().builder();
             boolean deleteOnly = fileStore.size() > maxStoreSize;
             for (int k = 0; k < opCount; k++) {
@@ -740,12 +741,7 @@ public class SegmentCompactionIT {
 
         @Override
         public long getFileStoreSize() {
-            try {
-                return fileStore.size();
-            } catch (IOException e) {
-                error("Error getting size of file store", e);
-                return -1;
-            }
+            return fileStore.size();
         }
 
         private CompactionMap getCompactionMap() {

Modified: 
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java?rev=1689362&r1=1689361&r2=1689362&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java
 Mon Jul  6 10:37:58 2015
@@ -231,11 +231,7 @@ public class StandbyStore implements Seg
 
     public long size() {
         if (delegate instanceof FileStore) {
-            try {
-                return ((FileStore) delegate).size();
-            } catch (IOException e) {
-                log.error("Error getting delegate size", e);
-            }
+            return ((FileStore) delegate).size();
         }
         return -1;
     }