cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject cxf git commit: Fix compile failures
Date Fri, 28 Jul 2017 17:23:45 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 9bbf7417e -> f46b6f0d2


Fix compile failures


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f46b6f0d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f46b6f0d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f46b6f0d

Branch: refs/heads/3.1.x-fixes
Commit: f46b6f0d26c359229934d6bab4da2e3f32905950
Parents: 9bbf741
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Jul 28 13:23:35 2017 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Jul 28 13:23:35 2017 -0400

----------------------------------------------------------------------
 .../cxf/jaxrs/provider/ProviderCache.java       |  2 -
 .../apache/cxf/jaxrs/impl/ResponseImplTest.java | 41 ++++++++++----------
 2 files changed, 20 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f46b6f0d/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
index 6d66b89..bc3c550 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
@@ -33,8 +33,6 @@ import javax.ws.rs.ext.MessageBodyWriter;
 import org.apache.cxf.jaxrs.model.ProviderInfo;
 
 public class ProviderCache {
-    private static final int MAX_PROVIDER_CACHE_SIZE = 
-        Integer.getInteger("org.apache.cxf.jaxrs.max_provider_cache_size", 100);
     private static final int MAX_PROVIDER_CACHE_SIZE =
         AccessController.doPrivileged(new PrivilegedAction<Integer>() {
             @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/f46b6f0d/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 915a3b6..369d3e5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -392,27 +392,26 @@ public class ResponseImplTest extends Assert {
     
     @Test
     public void testGetLinksNoRel() {
-        try (ResponseImpl ri = new ResponseImpl(200)) {
-            MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
-            ri.addMetadata(meta);
-    
-            Set<Link> links = ri.getLinks();
-            assertTrue(links.isEmpty());
-    
-            meta.add(HttpHeaders.LINK, "<http://next>");
-            meta.add(HttpHeaders.LINK, "<http://prev>");
-    
-            assertFalse(ri.hasLink("next"));
-            Link next = ri.getLink("next");
-            assertNull(next);
-            assertFalse(ri.hasLink("prev"));
-            Link prev = ri.getLink("prev");
-            assertNull(prev);
-    
-            links = ri.getLinks();
-            assertTrue(links.contains(Link.fromUri("http://next").build()));
-            assertTrue(links.contains(Link.fromUri("http://prev").build()));
-        }
+        ResponseImpl ri = new ResponseImpl(200);
+        MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+        ri.addMetadata(meta);
+
+        Set<Link> links = ri.getLinks();
+        assertTrue(links.isEmpty());
+
+        meta.add(HttpHeaders.LINK, "<http://next>");
+        meta.add(HttpHeaders.LINK, "<http://prev>");
+
+        assertFalse(ri.hasLink("next"));
+        Link next = ri.getLink("next");
+        assertNull(next);
+        assertFalse(ri.hasLink("prev"));
+        Link prev = ri.getLink("prev");
+        assertNull(prev);
+
+        links = ri.getLinks();
+        assertTrue(links.contains(Link.fromUri("http://next").build()));
+        assertTrue(links.contains(Link.fromUri("http://prev").build()));
     }
     
     public static class StringBean {


Mime
View raw message