# HG changeset patch # User Nozomi Teruya # Date 1434356511 -32400 # Node ID 82cc94d4062884ebf13bef383bb27ded07ed63e1 # Parent b3c9554ccb1b67096253f44b0f64165a85f0806a bug diff -r b3c9554ccb1b -r 82cc94d40628 src/main/java/alice/datasegment/CompressedRemoteDataSegmentManager.java --- a/src/main/java/alice/datasegment/CompressedRemoteDataSegmentManager.java Mon May 04 16:02:22 2015 +0900 +++ b/src/main/java/alice/datasegment/CompressedRemoteDataSegmentManager.java Mon Jun 15 17:21:51 2015 +0900 @@ -18,6 +18,11 @@ public CompressedRemoteDataSegmentManager(){} + public CompressedRemoteDataSegmentManager(Connection c) { + connection = c; + connection.name = "compressed" + c.name; + } + public CompressedRemoteDataSegmentManager(String connectionKey, final String reverseKey, final String hostName, final int port) { logger = Logger.getLogger(connectionKey); connection = new Connection(); diff -r b3c9554ccb1b -r 82cc94d40628 src/main/java/alice/datasegment/DataSegment.java --- a/src/main/java/alice/datasegment/DataSegment.java Mon May 04 16:02:22 2015 +0900 +++ b/src/main/java/alice/datasegment/DataSegment.java Mon Jun 15 17:21:51 2015 +0900 @@ -41,10 +41,10 @@ System.exit(0); } RemoteDataSegmentManager manager = new RemoteDataSegmentManager(connectionKey, reverseKey, hostName, port); - CompressedRemoteDataSegmentManager compressedManager = new CompressedRemoteDataSegmentManager(connectionKey + "!", reverseKey, hostName, port); + //CompressedRemoteDataSegmentManager compressedManager = new CompressedRemoteDataSegmentManager(manager.connection); register(connectionKey, manager); - register("compressed" + connectionKey, compressedManager); + //register("compressed" + connectionKey, compressedManager); return manager; } diff -r b3c9554ccb1b -r 82cc94d40628 src/main/java/alice/test/codesegment/remote/RemoteIncrement.java --- a/src/main/java/alice/test/codesegment/remote/RemoteIncrement.java Mon May 04 16:02:22 2015 +0900 +++ b/src/main/java/alice/test/codesegment/remote/RemoteIncrement.java Mon Jun 15 17:21:51 2015 +0900 @@ -18,9 +18,9 @@ if (num == 10) System.exit(0); RemoteIncrement cs = new RemoteIncrement(); - cs.num.setKey("compressedremote", "num"); + cs.num.setKey("remote", "num"); - ods.put("compressedlocal", "num", num); + ods.put("local", "num", num); } } \ No newline at end of file diff -r b3c9554ccb1b -r 82cc94d40628 src/main/java/alice/test/codesegment/remote/RemoteStartCodeSegment.java --- a/src/main/java/alice/test/codesegment/remote/RemoteStartCodeSegment.java Mon May 04 16:02:22 2015 +0900 +++ b/src/main/java/alice/test/codesegment/remote/RemoteStartCodeSegment.java Mon Jun 15 17:21:51 2015 +0900 @@ -7,8 +7,8 @@ @Override public void run() { RemoteIncrement cs = new RemoteIncrement(); - cs.num.setKey("compressedremote", "num"); + cs.num.setKey("remote", "num"); - ods.put("compressedlocal", "num", 0); + ods.put("local", "num", 0); } } \ No newline at end of file