From 29c838253772a7f03ca3832139bab0388c20df03 Mon Sep 17 00:00:00 2001 From: rfeng Date: Mon, 17 Sep 2012 18:10:11 +0000 Subject: Enhance the include/exclude filter processing and fix a NPE git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1386756 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/rest/provider/DataBindingJAXRSWriter.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany') diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSWriter.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSWriter.java index 4ee1ff8c92..6064d23b1e 100644 --- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSWriter.java +++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSWriter.java @@ -120,8 +120,16 @@ public class DataBindingJAXRSWriter extends DataBindingJAXRSProvider implemen Set fieldSet = tokenize(fields); for (String f : fieldSet) { if (f.startsWith("-")) { + if (excludedFields == null) { + excludedFields = new HashSet(); + metadata.put(EXCLUDED_FIELDS, excludedFields); + } excludedFields.add(f.substring(1)); } else { + if (includedFields == null) { + includedFields = new HashSet(); + metadata.put(INCLUDED_FIELDS, includedFields); + } includedFields.add(f); } } -- cgit v1.2.3