# HG changeset patch # User suruga # Date 1517997776 -32400 # Node ID 058bff2123c8848a8b544edb364b4db7092a4a2e # Parent 4289b232b3fdaf62c62ec66abbfe866fda83ec80 fix getValue diff -r 4289b232b3fd -r 058bff2123c8 src/main/java/alice/datasegment/ReceiveData.java --- a/src/main/java/alice/datasegment/ReceiveData.java Fri Feb 02 18:26:49 2018 +0900 +++ b/src/main/java/alice/datasegment/ReceiveData.java Wed Feb 07 19:02:56 2018 +0900 @@ -119,7 +119,7 @@ return packer.read(messagePack, clazz); - } catch (IOException e) {// | DataFormatException e + } catch (IOException e) {// | DataFormatExceptione e.printStackTrace(); return null; } diff -r 4289b232b3fd -r 058bff2123c8 src/main/java/alice/datasegment/Receiver.java --- a/src/main/java/alice/datasegment/Receiver.java Fri Feb 02 18:26:49 2018 +0900 +++ b/src/main/java/alice/datasegment/Receiver.java Wed Feb 07 19:02:56 2018 +0900 @@ -3,6 +3,9 @@ import alice.codesegment.InputDataSegment; import javassist.compiler.ast.ASTree; +import org.msgpack.type.NilValue; +import org.msgpack.type.Value; +import org.omg.CORBA.Object; /** * idsコマンド(create, setKey)の処理をする。コマンドの定義はids/LDSM内にある。 @@ -115,8 +118,12 @@ return data.getObj(); } - public Object getVal() { - return data.getVal(); + public Value getVal() { + Value obj = data.getVal(); + if (obj.getClass() == NilValue.class) + return null; + else + return obj; } public ReceiveData getReceiveData() {