From fd8108209688cda9e782a4c3c91be522eb3ed1f4 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 29 Oct 2013 16:21:08 +0100 Subject: Exception cleanup Allow versions to be null: use Integer or String --- src/main/java/com/c2kernel/graph/model/GraphableVertex.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/c2kernel/graph/model') diff --git a/src/main/java/com/c2kernel/graph/model/GraphableVertex.java b/src/main/java/com/c2kernel/graph/model/GraphableVertex.java index 77be7a8..b0b74fd 100644 --- a/src/main/java/com/c2kernel/graph/model/GraphableVertex.java +++ b/src/main/java/com/c2kernel/graph/model/GraphableVertex.java @@ -26,10 +26,11 @@ public abstract class GraphableVertex extends Vertex { return mProperties; } - protected int getVersionNumberProperty(String propName) throws InvalidDataException { + protected Integer getVersionNumberProperty(String propName) throws InvalidDataException { Object val = getProperties().get(propName); + if (val == null || val.equals("") || val.toString().equals("-1")) return null; try { - return Integer.parseInt(val.toString()); + return new Integer(val.toString()); } catch (NumberFormatException ex) { throw new InvalidDataException("Invalid version number for property '"+propName+"': "+val.toString(), ""); } -- cgit v1.2.3