aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-01-04 10:18:56 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2013-01-04 10:18:56 +0100
commit4a6c9c52d006ecb717bae7d9b502d9b661a08ccd (patch)
tree2b31f40d854f137a960933f5e2d99ebb98f48935 /src/main/java
parent5c8c3467906d996c04210cc8350edbd027ccc32a (diff)
downloadesper-testing-4a6c9c52d006ecb717bae7d9b502d9b661a08ccd.tar.gz
esper-testing-4a6c9c52d006ecb717bae7d9b502d9b661a08ccd.tar.bz2
esper-testing-4a6c9c52d006ecb717bae7d9b502d9b661a08ccd.tar.xz
esper-testing-4a6c9c52d006ecb717bae7d9b502d9b661a08ccd.zip
o Using the PagingTableService on the front page and person apps.
Diffstat (limited to 'src/main/java')
-rwxr-xr-x[-rw-r--r--]src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java b/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java
index 46964a0..a02bb5c 100644..100755
--- a/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java
+++ b/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java
@@ -86,6 +86,10 @@ public class JerseyApplication extends Application {
}
private UUID parse(String s) {
+ if(s == null) {
+ return null;
+ }
+
try {
return UUID.fromString(s);
} catch (IllegalArgumentException e) {