Author: frm
Date: Thu Dec 10 11:44:10 2015
New Revision: 1719068
URL: http://svn.apache.org/viewvc?rev=1719068&view=rev
Log:
OAK-3762 - Make StandbyServerHandler catch IllegalRepositoryStateException
instead of IllegalStateException
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServerHandler.java
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServerHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServerHandler.java?rev=1719068&r1=1719067&r2=1719068&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServerHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServerHandler.java
Thu Dec 10 11:44:10 2015
@@ -30,6 +30,7 @@ import io.netty.channel.ChannelHandlerCo
import io.netty.channel.SimpleChannelInboundHandler;
import org.apache.jackrabbit.oak.api.Blob;
+import org.apache.jackrabbit.oak.api.IllegalRepositoryStateException;
import org.apache.jackrabbit.oak.plugins.segment.RecordId;
import org.apache.jackrabbit.oak.plugins.segment.Segment;
import org.apache.jackrabbit.oak.plugins.segment.SegmentId;
@@ -156,7 +157,7 @@ public class StandbyServerHandler extend
s = store.readSegment(new SegmentId(store.getTracker(),
uuid.getMostSignificantBits(), uuid
.getLeastSignificantBits()));
- } catch (IllegalStateException e) {
+ } catch (IllegalRepositoryStateException e) {
// segment not found
log.debug("waiting for segment. Got exception: " +
e.getMessage());
TimeUnit.MILLISECONDS.sleep(2000);