cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1489386 - in /cxf/branches/2.6.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/
Date Tue, 04 Jun 2013 10:55:54 GMT
Author: sergeyb
Date: Tue Jun  4 10:55:53 2013
New Revision: 1489386

URL: http://svn.apache.org/r1489386
Log:
Merged revisions 1489377 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1489377 | sergeyb | 2013-06-04 11:41:02 +0100 (Tue, 04 Jun 2013) | 17 lines
  
  Merged revisions 1489368,1489370,1489372 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1489368 | sergeyb | 2013-06-04 11:15:05 +0100 (Tue, 04 Jun 2013) | 1 line
    
    Updating WADL schema to Java type map with float and double
  ........
    r1489370 | sergeyb | 2013-06-04 11:18:08 +0100 (Tue, 04 Jun 2013) | 1 line
    
    Getting all of the code needed to set a field value run as privileged
  ........
    r1489372 | sergeyb | 2013-06-04 11:24:42 +0100 (Tue, 04 Jun 2013) | 1 line
    
    [CXF-5053] Updating JAX-RS MessageContext to return Message, to be consistent with CXF
JAX-WS MessageContext, patch from Minto van der Sluis applied
  ........
................

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
    cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
    cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1489377
  Merged /cxf/trunk:r1489368-1489372

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java?rev=1489386&r1=1489385&r2=1489386&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
Tue Jun  4 10:55:53 2013
@@ -81,10 +81,15 @@ public class MessageContextImpl implemen
             return m.getExchange().getOutMessage().get(Message.ATTACHMENTS);
         }
         Object value = m.get(key);
-        if (value == null && m.getExchange() != null) {
-            Message inMessage = m.getExchange().getInMessage();
-            if (inMessage != null && inMessage != m) {
-                value = inMessage.get(key);
+        if (value == null) {
+            if (Message.class.getName().equals(key)) {
+                return m;
+            }
+            if (m.getExchange() != null) {
+                Message inMessage = m.getExchange().getInMessage();
+                if (inMessage != null && inMessage != m) {
+                    value = inMessage.get(key);
+                }
             }
         } 
         return value;

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java?rev=1489386&r1=1489385&r2=1489386&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
Tue Jun  4 10:55:53 2013
@@ -162,8 +162,8 @@ public final class InjectionUtils {
                                         final Object v) {
         AccessController.doPrivileged(new PrivilegedAction<Object>() {
             public Object run() {
-                f.setAccessible(true);
                 try {
+                    f.setAccessible(true);
                     f.set(o, v);
                 } catch (IllegalAccessException ex) {
                     reportServerError("FIELD_ACCESS_FAILURE", 
@@ -179,8 +179,8 @@ public final class InjectionUtils {
                                         final Object o) {
         return AccessController.doPrivileged(new PrivilegedAction<Object>() {
             public Object run() {
-                f.setAccessible(true);
                 try {
+                    f.setAccessible(true);
                     return f.get(o);
                 } catch (IllegalAccessException ex) {
                     reportServerError("FIELD_ACCESS_FAILURE", 

Modified: cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java?rev=1489386&r1=1489385&r2=1489386&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
Tue Jun  4 10:55:53 2013
@@ -156,6 +156,8 @@ public class SourceGenerator {
         XSD_SPECIFIC_TYPE_MAP = new HashMap<String, String>();
         XSD_SPECIFIC_TYPE_MAP.put("string", "String");
         XSD_SPECIFIC_TYPE_MAP.put("integer", "long");
+        XSD_SPECIFIC_TYPE_MAP.put("float", "float");
+        XSD_SPECIFIC_TYPE_MAP.put("doable", "doable");
         XSD_SPECIFIC_TYPE_MAP.put("int", "int");
         XSD_SPECIFIC_TYPE_MAP.put("long", "long");
         XSD_SPECIFIC_TYPE_MAP.put("byte", "byte");



Mime
View raw message