Author: sergeyb
Date: Wed Aug 8 10:29:29 2012
New Revision: 1370732
URL: http://svn.apache.org/viewvc?rev=1370732&view=rev
Log:
[CXF-4455] A couple of other updates
Modified:
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
Modified:
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java?rev=1370732&r1=1370731&r2=1370732&view=diff
==============================================================================
---
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java
(original)
+++
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java
Wed Aug 8 10:29:29 2012
@@ -122,7 +122,7 @@ public class BootstrapStorage {
StaticFile staticFile = new StaticFile(url, acceptsGzip(mc),
mime);
Response.ResponseBuilder builder = Response.ok(staticFile);
- builder.variant(new Variant(mime , null,
staticFile.isGzipEnabled() ? "gzip" : null));
+ builder.variant(new Variant(mime , (String)null,
staticFile.isGzipEnabled() ? "gzip" : null));
return builder.build();
}
Modified:
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java?rev=1370732&r1=1370731&r2=1370732&view=diff
==============================================================================
---
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
(original)
+++
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
Wed Aug 8 10:29:29 2012
@@ -315,7 +315,7 @@ public class CrossOriginResourceSharingF
if (op == null || op == PREFLIGHT_FAILED) {
return response;
}
-
+
ResponseBuilder rbuilder = Response.fromResponse(response);
/* Common to simple and preflight */
