svn commit: r1839336 - in /uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server: DuccHandlerClassic.java DuccHandlerJsonFormat.java

[degenaro]

Author: degenaro
Date: Mon Aug 27 14:48:53 2018
New Revision: 1839336

URL: http://svn.apache.org/viewvc?rev=1839336&view=rev
Log:
UIMA-5859 DUCC Web Server (WS) java.lang.NullPointerException

Modified:
    
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
    
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1839336&r1=1839335&r2=1839336&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
 Mon Aug 27 14:48:53 2018
@@ -2161,7 +2161,11 @@ public class DuccHandlerClassic extends
                
                Map<String, Map<String, String>> topicAttributes = 
brokerHelper.getEntityAttributes();
                
-               if(topicAttributes.size() > 0) {
+               int taSize = 0;
+               if(topicAttributes != null) {
+                       taSize = topicAttributes.size();
+               }
+               if(taSize > 0) {
                        for(Entry<String, Map<String, String>> entry : 
topicAttributes.entrySet()) {
                                String topic = entry.getKey();
                                String attrValue;

Modified: 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1839336&r1=1839335&r2=1839336&view=diff
==============================================================================
--- 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
 Mon Aug 27 14:48:53 2018
@@ -2089,7 +2089,11 @@ public class DuccHandlerJsonFormat exten
 
                Map<String, Map<String, String>> topicAttributes = 
brokerHelper.getEntityAttributes();
                
-               if(topicAttributes.size() > 0) {
+               int taSize = 0;
+               if(topicAttributes != null) {
+                       taSize = topicAttributes.size();
+               }
+               if(taSize > 0) {
                        for(Entry<String, Map<String, String>> entry : 
topicAttributes.entrySet()) {
                                String topic = entry.getKey();
                                String attrValue;