summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2014-11-06 07:30:37 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2014-11-06 07:30:37 +0100
commit8eb65febb84af1472513fdecbf9553817d2ab93b (patch)
treed25e06dda209b4c2424653cc046d3be9300f9920
parent2f3b7f180511a5e0af674e3a25ddbaabaa38d36c (diff)
downloadegovutils-8eb65febb84af1472513fdecbf9553817d2ab93b.tar.gz
egovutils-8eb65febb84af1472513fdecbf9553817d2ab93b.tar.bz2
egovutils-8eb65febb84af1472513fdecbf9553817d2ab93b.zip
fix Nullpointer if UR result includes a FunktionsRegel without a date
-rw-r--r--src/main/java/at/gv/util/client/ur_V5/URClient.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/main/java/at/gv/util/client/ur_V5/URClient.java b/src/main/java/at/gv/util/client/ur_V5/URClient.java
index 537ed25..59bf501 100644
--- a/src/main/java/at/gv/util/client/ur_V5/URClient.java
+++ b/src/main/java/at/gv/util/client/ur_V5/URClient.java
@@ -233,7 +233,20 @@ public class URClient {
if (this.allowedERsBKeys.contains(String.valueOf(funct.getFktName()))) {
List<FktRegelTypVollzug> functRegel = funct.getFktRegel();
for (FktRegelTypVollzug el : functRegel) {
- if ( (el.getFktRegelVon().compare(xmldate) == DatatypeConstants.LESSER
+ if ( el.getFktRegelVon() == null && el.getFktRegelBis() == null)
+ set.add(String.valueOf(funct.getFktName()));
+
+ else if ( el.getFktRegelVon() != null && el.getFktRegelBis() == null
+ && el.getFktRegelVon().compare(xmldate) == DatatypeConstants.LESSER )
+ set.add(String.valueOf(funct.getFktName()));
+
+ else if ( el.getFktRegelVon() == null && el.getFktRegelBis() != null
+ && el.getFktRegelBis().compare(xmldate) == DatatypeConstants.GREATER )
+ set.add(String.valueOf(funct.getFktName()));
+
+
+ else if ( el.getFktRegelVon() != null && el.getFktRegelBis() != null
+ && (el.getFktRegelVon().compare(xmldate) == DatatypeConstants.LESSER
&& el.getFktRegelBis().compare(xmldate) == DatatypeConstants.GREATER) )
set.add(String.valueOf(funct.getFktName()));