Author: rgodfrey
Date: Tue Jul  7 12:54:20 2015
New Revision: 1689650

URL: http://svn.apache.org/r1689650
Log:
NO-JIRA : Remove uses of deprecated methods / unused code

Removed:
    
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnexpectedMethodException.java
Modified:
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObjectTypeFactory.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModule.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/CurrentThreadTaskExecutor.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1689650&r1=1689649&r2=1689650&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
 Tue Jul  7 12:54:20 2015
@@ -602,7 +602,7 @@ public abstract class AbstractConfigured
                         // No need to decrement counter as setting the 
exception will complete the future
                         returnVal.setException(t);
                     }
-                }, MoreExecutors.sameThreadExecutor());
+                }, MoreExecutors.directExecutor());
             }
         });
 

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObjectTypeFactory.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObjectTypeFactory.java?rev=1689650&r1=1689649&r2=1689650&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObjectTypeFactory.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObjectTypeFactory.java
 Tue Jul  7 12:54:20 2015
@@ -87,7 +87,7 @@ abstract public class AbstractConfigured
             {
                 returnVal.setException(t);
             }
-        },MoreExecutors.sameThreadExecutor());
+        },MoreExecutors.directExecutor());
 
         return returnVal;
     }

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModule.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModule.java?rev=1689650&r1=1689649&r2=1689650&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModule.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModule.java
 Tue Jul  7 12:54:20 2015
@@ -55,7 +55,7 @@ public class ConfiguredObjectJacksonModu
 
     private  ConfiguredObjectJacksonModule()
     {
-        super("ConfiguredObjectSerializer", new Version(1,0,0,null));
+        super("ConfiguredObjectSerializer", new Version(1,0,0,null, 
"org.apache.qpid", "broker-core"));
         addConfiguredObjectSerializer();
         addManageableAttributeTypeSerializer();
         addCertificateSerializer();

Modified: 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/CurrentThreadTaskExecutor.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/CurrentThreadTaskExecutor.java?rev=1689650&r1=1689649&r2=1689650&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/CurrentThreadTaskExecutor.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/CurrentThreadTaskExecutor.java
 Tue Jul  7 12:54:20 2015
@@ -156,7 +156,7 @@ public class CurrentThreadTaskExecutor i
     @Override
     public Executor getExecutor()
     {
-        return MoreExecutors.sameThreadExecutor();
+        return MoreExecutors.directExecutor();
     }
 
     @Override



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to