cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1397537 - in /cxf/trunk: api/src/main/java/org/apache/cxf/common/util/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/ rt/core/src/main/java/org/apache/cxf/bus/spring/ services/wsn/wsn-core/src/main/java/org/apac...
Date Fri, 12 Oct 2012 12:20:55 GMT
Author: coheigea
Date: Fri Oct 12 12:20:54 2012
New Revision: 1397537

URL: http://svn.apache.org/viewvc?rev=1397537&view=rev
Log:
Some more updates

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ClassReader.java
    cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
    cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java
    cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/RandomValueProvider.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ClassReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ClassReader.java?rev=1397537&r1=1397536&r2=1397537&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ClassReader.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ClassReader.java Fri Oct 12 12:20:54
2012
@@ -326,7 +326,8 @@ public class ClassReader extends ByteArr
             case CONSTANT_NAME_AND_TYPE:
 
                 readShort(); // class index or (12) name index
-                // fall through
+                readShort(); // string index or class index
+                break;
 
             case CONSTANT_CLASS:
             case CONSTANT_STRING:
@@ -342,7 +343,8 @@ public class ClassReader extends ByteArr
                 // see jvm spec section 4.4.5 - double and long cpool
                 // entries occupy two "slots" in the cpool table.
                 i++;
-                // fall through
+                readInt(); // value
+                break;
 
             case CONSTANT_INTEGER:
             case CONSTANT_FLOAT:

Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java?rev=1397537&r1=1397536&r2=1397537&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
(original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
Fri Oct 12 12:20:54 2012
@@ -113,7 +113,7 @@ public final class SystemExceptionHelper
         int index = -1;
 
         while (left < right) {
-            int m = (left + right) / 2;
+            int m = (left + right) >>> 1;
             int res = arr[m].compareTo(value);
             if (res == 0) {
                 index = m;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java?rev=1397537&r1=1397536&r2=1397537&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
Fri Oct 12 12:20:54 2012
@@ -87,11 +87,11 @@ public class Jsr250BeanPostProcessor 
                 } catch (NoSuchBeanDefinitionException t) {
                     //ignore - no resource manager
                 }
-                if (resourceManager == null && m == null) {
+                if (m == null) {
                     b = (Bus)context.getBean("cxf");
                     m = b.getExtension(ResourceManager.class);
                 }
-                if (resourceManager == null && m != null) {
+                if (m != null) {
                     resourceManager = m;
                     if (!(b instanceof SpringBus)) {
                         resourceManager

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java?rev=1397537&r1=1397536&r2=1397537&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
(original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
Fri Oct 12 12:20:54 2012
@@ -251,7 +251,9 @@ public abstract class AbstractNotificati
             throw new SubscribeCreationFailedFault("Unable to register new endpoint", fault,
e);
         } finally {
             if (!success && subscription != null) {
-                subscriptions.remove(subscription);
+                if (subscription.getAddress() != null) {
+                    subscriptions.remove(subscription.getAddress());
+                }
                 try {
                     subscription.unsubscribe();
                 } catch (UnableToDestroySubscriptionFault e) {

Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java?rev=1397537&r1=1397536&r2=1397537&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java
(original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java
Fri Oct 12 12:20:54 2012
@@ -22,7 +22,6 @@ package org.apache.cxf.testutil.recorder
 import java.io.OutputStream;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.apache.cxf.common.logging.LogUtils;
@@ -87,9 +86,6 @@ public class OutMessageRecorder extends 
             // bytes were already copied after flush
             try {
                 byte bytes[] = cos.getBytes();
-                if (LOG.isLoggable(Level.FINE)) {
-                    LOG.fine("outbound: " + bytes);
-                }
                 synchronized (outbound) {
                     outbound.add(bytes);    
                 }

Modified: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/RandomValueProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/RandomValueProvider.java?rev=1397537&r1=1397536&r2=1397537&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/RandomValueProvider.java
(original)
+++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/RandomValueProvider.java
Fri Oct 12 12:20:54 2012
@@ -86,13 +86,21 @@ public class RandomValueProvider impleme
     public BigDecimal getBigDecimalValue(String path) {
         String s = Long.toString(random.nextLong());
         s += ".";
-        s += Long.toString(Math.abs(random.nextLong()));
+        long nextLong = random.nextLong();
+        if (nextLong == Long.MIN_VALUE) {
+            nextLong++;
+        }
+        s += Long.toString(Math.abs(nextLong));
         return new BigDecimal(s);
     }
     
     public BigInteger getBigIntegerValue(String path) {
         String s = Long.toString(random.nextLong());
-        s += Long.toString(Math.abs(random.nextLong()));
+        long nextLong = random.nextLong();
+        if (nextLong == Long.MIN_VALUE) {
+            nextLong++;
+        }
+        s += Long.toString(Math.abs(nextLong));
         return new BigInteger(s);
     }
 



Mime
View raw message