[Dive4elements-commits] [PATCH 6 of 6] FLYSUtils: Null-guard some conditionals (autoboxes)

Wald Commits scm-commit at wald.intevation.org
Mon Nov 5 17:28:15 CET 2012


# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1352133179 -3600
# Node ID c62598c372ab7ebaf616c7ce3b93419ba48d855a
# Parent  1b4aaa7dbd0745c7f95cf7760411c6cfb1f3a976
FLYSUtils: Null-guard some conditionals (autoboxes).

diff -r 1b4aaa7dbd07 -r c62598c372ab flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java	Mon Nov 05 17:31:51 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java	Mon Nov 05 17:32:59 2012 +0100
@@ -187,10 +187,10 @@
 
         Boolean isFree = flys.getDataAsBoolean("wq_isfree");
 
-        if (isQ) {
+        if (isQ != null && isQ) {
             return isFree ? WQ_MODE.QFREE : WQ_MODE.QGAUGE;
         }
-        else if (!isQ) {
+        else if (isQ != null && !isQ) {
             return isFree ? WQ_MODE.WFREE : WQ_MODE.WGAUGE;
         }
         else {


More information about the Dive4elements-commits mailing list