You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2014/09/10 15:06:24 UTC
svn commit: r1623991 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java
Author: degenaro
Date: Wed Sep 10 13:06:24 2014
New Revision: 1623991
URL: http://svn.apache.org/r1623991
Log:
UIMA-4006 DUCC Web Server (WS) NPE in DuccHandlerClassic
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java?rev=1623991&r1=1623990&r2=1623991&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java Wed Sep 10 13:06:24 2014
@@ -145,65 +145,63 @@ public class DuccWebUtil {
boolean list = false;
DuccCookies.FilterUsersStyle filterUsersStyle = DuccCookies.getFilterUsersStyle(request);
if(!users.isEmpty()) {
- if(propertiesMeta != null) {
- String user = propertiesMeta.getProperty(key_user);
- if(user != null) {
- user = user.trim();
- switch(filterUsersStyle) {
- case IncludePlusActive:
- if(isAvailable(propertiesMeta)) {
- list = true;
- }
- else if(users.contains(user)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
+ String user = propertiesMeta.getProperty(key_user).trim();
+ if(user != null) {
+ user = user.trim();
+ switch(filterUsersStyle) {
+ case IncludePlusActive:
+ if(isAvailable(propertiesMeta)) {
+ list = true;
+ }
+ else if(users.contains(user)) {
+ if(maxRecords > 0) {
+ if (counter < maxRecords) {
+ list = true;
}
}
- break;
- case ExcludePlusActive:
- if(isAvailable(propertiesMeta)) {
- list = true;
- }
- else if(!users.contains(user)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
+ }
+ break;
+ case ExcludePlusActive:
+ if(isAvailable(propertiesMeta)) {
+ list = true;
+ }
+ else if(!users.contains(user)) {
+ if(maxRecords > 0) {
+ if (counter < maxRecords) {
+ list = true;
}
}
- break;
- case Include:
- if(users.contains(user)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
+ }
+ break;
+ case Include:
+ if(users.contains(user)) {
+ if(maxRecords > 0) {
+ if (counter < maxRecords) {
+ list = true;
}
}
- break;
- case Exclude:
- if(!users.contains(user)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
+ }
+ break;
+ case Exclude:
+ if(!users.contains(user)) {
+ if(maxRecords > 0) {
+ if (counter < maxRecords) {
+ list = true;
}
}
- break;
- }
- }
+ }
+ break;
+ }
+ }
+ }
+ else {
+ if(isAvailable(propertiesMeta)) {
+ list = true;
}
- else {
- if(isAvailable(propertiesMeta)) {
+ else if(maxRecords > 0) {
+ if (counter < maxRecords) {
list = true;
}
- else if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
- }
}
}
return list;