You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2008/07/07 16:40:18 UTC
svn commit: r674508 - in
/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs:
model/AbstractResourceInfo.java utils/InjectionUtils.java
Author: sergeyb
Date: Mon Jul 7 07:40:18 2008
New Revision: 674508
URL: http://svn.apache.org/viewvc?rev=674508&view=rev
Log:
CXF-1691 : applying Brad's patch (thanks !) and fixing a typo in InjectionUtils
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java?rev=674508&r1=674507&r2=674508&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java Mon Jul 7 07:40:18 2008
@@ -188,7 +188,9 @@
return;
}
for (ThreadLocalProxy tlp : tlps.values()) {
- tlp.remove();
+ if (tlp != null) {
+ tlp.remove();
+ }
}
}
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java?rev=674508&r1=674507&r2=674508&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java Mon Jul 7 07:40:18 2008
@@ -39,6 +39,7 @@
import java.util.TreeSet;
import java.util.logging.Logger;
+import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Request;
@@ -284,7 +285,7 @@
proxy = new ThreadLocalRequest();
} else if (MessageBodyWorkers.class.isAssignableFrom(type)) {
proxy = new ThreadLocalMessageBodyWorkers();
- } else if (MessageBodyWorkers.class.isAssignableFrom(type)) {
+ } else if (HttpServletRequest.class.isAssignableFrom(type)) {
proxy = new ThreadLocalHttpServletRequest();
}
return proxy;