1.0.16-release

fix inputstream close bug

.travis.yml

@@ -6,7 +6,7 @@ jdk:
     - openjdk7
 branches:
   only:
-    - 1.0.15
+    - 1.0.16
 services:
   - redis-server
 before_install:

README.md

@@ -26,7 +26,7 @@ rdb version 7
 <dependency>
     <groupId>com.moilioncircle</groupId>
     <artifactId>redis-replicator</artifactId>
-    <version>1.0.15</version>
+    <version>1.0.16</version>
 </dependency>
 ```
 

pom.xml

@@ -22,7 +22,7 @@
 
     <groupId>com.moilioncircle</groupId>
     <artifactId>redis-replicator</artifactId>
-    <version>1.0.15</version>
+    <version>1.0.16</version>
 
     <name>redis-replicator</name>
     <description>Redis Replicator is a redis RDB and Command parser written in java.

src/main/java/com/moilioncircle/redis/replicator/RedisAofReplicator.java

@@ -54,6 +54,14 @@ public RedisAofReplicator(InputStream in, Configuration configuration) {
 
     @Override
     public void open() throws IOException {
+        try {
+            doOpen();
+        } finally {
+            close();
+        }
+    }
+
+    private void doOpen() {
         worker.start();
         while (true) {
             try {
@@ -81,7 +89,6 @@ public void open() throws IOException {
                     logger.info("Redis reply:" + obj);
                 }
             } catch (IOException | InterruptedException e) {
-                doClose();
                 break;
             }
         }

src/main/java/com/moilioncircle/redis/replicator/RedisRdbReplicator.java

@@ -41,10 +41,18 @@ public RedisRdbReplicator(InputStream in, Configuration configuration) {
 
     @Override
     public void open() throws IOException {
+        try {
+            doOpen();
+        } catch (IOException e) {
+        } finally {
+            close();
+        }
+    }
+
+    private void doOpen() throws IOException {
         worker.start();
         RdbParser parser = new RdbParser(inputStream, this);
         parser.parse();
-        doClose();
     }
 
     @Override

src/main/java/com/moilioncircle/redis/replicator/RedisSocketReplicator.java

@@ -125,11 +125,11 @@ public void handle(long len) {
                         Object[] params = new Object[command.length - 1];
                         System.arraycopy(command, 1, params, 0, params.length);
 
+                        final CommandParser<? extends Command> operations;
                         //if command do not register. ignore
-                        if (commands.get(cmdName) == null) continue;
+                        if ((operations = commands.get(cmdName)) == null) continue;
 
                         //do command replyParser
-                        CommandParser<? extends Command> operations = commands.get(cmdName);
                         Command parsedCommand = operations.parse(cmdName, params);
 
                         //submit event

src/main/java/com/moilioncircle/redis/replicator/io/RedisInputStream.java

@@ -166,6 +166,7 @@ public String readString(int len, Charset charset) throws IOException {
         return new String(original, charset);
     }
 
+    @Override
     public int read(byte[] bytes, int offset, int len) throws IOException {
         int total = len;
         int index = offset;
@@ -185,6 +186,7 @@ public int read(byte[] bytes, int offset, int len) throws IOException {
         return len;
     }
 
+    @Override
     public int available() throws IOException {
         return tail - head + in.available();
     }
@@ -196,6 +198,7 @@ public void fill() throws IOException {
         head = 0;
     }
 
+    @Override
     public long skip(long len) throws IOException {
         long total = len;
         while (total > 0) {
@@ -210,4 +213,9 @@ public long skip(long len) throws IOException {
         }
         return len;
     }
+
+    @Override
+    public void close() throws IOException {
+        in.close();
+    }
 }