1.0.6

michaeldg · May 8, 2014 · 8f94089 · 8f94089
1 parent c23d275
commit 8f94089
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/.classpath b/.classpath
@@ -12,6 +12,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

diff --git a/src/main/java/com/google/code/or/io/impl/XInputStreamImpl.java b/src/main/java/com/google/code/or/io/impl/XInputStreamImpl.java
@@ -123,7 +123,7 @@ public int readInt(int length, boolean littleEndian) throws IOException {
 	public long readLong(int length, boolean littleEndian) throws IOException {
 		long r = 0;
 		for(int i = 0; i < length; ++i) {
-			final int v = this.read();
+			final long v = this.read();
 			if(littleEndian) {
 				r |= (v << (i << 3));
 			} else {

diff --git a/src/test/java/com/google/code/or/OpenReplicatorTest.java b/src/test/java/com/google/code/or/OpenReplicatorTest.java
@@ -9,7 +9,6 @@
 
 import com.google.code.or.binlog.BinlogEventListener;
 import com.google.code.or.binlog.BinlogEventV4;
-import com.google.code.or.binlog.impl.event.XidEvent;
 
 public class OpenReplicatorTest {
 	//
@@ -30,9 +29,7 @@ public static void main(String args[]) throws Exception {
 		or.setBinlogFileName("mysql-bin.000001");
 		or.setBinlogEventListener(new BinlogEventListener() {
 		    public void onEvents(BinlogEventV4 event) {
-		    	if(event instanceof XidEvent) {
-		    		LOGGER.info("{}", event);
-		    	}
+		    	LOGGER.info("{}", event);
 		    }
 		});
 		or.start();

diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
@@ -0,0 +1,25 @@
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{yy-MM-dd HH:mm:ss.SSS} %-5level[%thread %logger{0}.%M:%L]%marker %msg%n</pattern>
+      <outputPatternAsHeader>true</outputPatternAsHeader>
+      <immediateFlush>true</immediateFlush>
+    </encoder>
+  </appender>
+
+  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${APP_HOME}/log/${APP_NAME}.%d{yyyy-MM-dd}.log</fileNamePattern>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%d{yy-MM-dd HH:mm:ss.SSS} %-5level[%thread %logger{0}.%M:%L]%marker %msg%n</pattern>
+      <outputPatternAsHeader>true</outputPatternAsHeader>
+      <immediateFlush>true</immediateFlush>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="FILE" />
+  </root>
+</configuration>