svn commit: r591876 - in /incubator/cxf/trunk: rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java

[jliu]

Author: jliu
Date: Sun Nov  4 19:30:28 2007
New Revision: 591876

URL: http://svn.apache.org/viewvc?rev=591876&view=rev
Log:
Fixed an NPE. 

Modified:
    
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java
    
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java

Modified: 
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java?rev=591876&r1=591875&r2=591876&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSDispatchInterceptor.java
 Sun Nov  4 19:30:28 2007
@@ -124,7 +124,7 @@
         for (OperationResourceInfo ori : 
resource.getMethodDispatcher().getOperationResourceInfos()) {
             URITemplate uriTemplate = ori.getURITemplate();
             if (uriTemplate != null && uriTemplate.match(path, values)
-                && ori.getHttpMethod().equalsIgnoreCase(httpMethod)) {
+                && ori.getHttpMethod() != null && 
ori.getHttpMethod().equalsIgnoreCase(httpMethod)) {
                 return ori;
             } /*
                  * else { //URITemplate == null means match by default if

Modified: 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=591876&r1=591875&r2=591876&view=diff
==============================================================================
--- 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
 (original)
+++ 
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
 Sun Nov  4 19:30:28 2007
@@ -189,8 +189,7 @@
         }               
     } 
         
-    //@Test
-    @org.junit.Ignore
+    @Test
     public void testGetCDs() throws Exception {
         String endpointAddress =
             "http://localhost:9080/bookstore/cds";; 
@@ -199,10 +198,10 @@
         assertNotNull(in);           
 
 /*        InputStream expected = getClass()
-            .getResourceAsStream("resources/expected_get_cds.txt");*/
+            .getResourceAsStream("resources/expected_get_cds.txt");
 
-        //System.out.println("---" + getStringFromInputStream(in));
-        //assertEquals(getStringFromInputStream(expected), 
getStringFromInputStream(in)); 
+        System.out.println("---" + getStringFromInputStream(in));
+        assertEquals(getStringFromInputStream(expected), 
getStringFromInputStream(in)); */
     }
     
     @Test