JBossWS SVN: r5176 - in framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples: logicalhandler and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-04 10:12:31 -0500 (Tue, 04 Dec 2007)
New Revision: 5176
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
Log:
FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-12-04 15:02:56 UTC (rev 5175)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-12-04 15:12:31 UTC (rev 5176)
@@ -88,10 +88,15 @@
if (isIntegrationSunRI())
{
System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
- return;
}
-
- String resStr = port.echo("Kermit");
- assertEquals("Kermit|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn|endpoint|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn", resStr);
+ else if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
+ }
+ else
+ {
+ String resStr = port.echo("Kermit");
+ assertEquals("Kermit|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn|endpoint|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn", resStr);
+ }
}
}
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-12-04 15:02:56 UTC (rev 5175)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-12-04 15:12:31 UTC (rev 5176)
@@ -64,6 +64,10 @@
{
System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
}
+ else if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
+ }
else
{
expStr.append(":Outbound:LogicalJAXBHandler");
@@ -81,6 +85,10 @@
{
System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
}
+ else if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
+ }
else
{
expStr.append(":Inbound:PortHandler");
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-12-04 15:02:56 UTC (rev 5175)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-12-04 15:12:31 UTC (rev 5176)
@@ -60,6 +60,10 @@
{
System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
}
+ else if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
+ }
else
{
expStr.append(":Outbound:LogicalSourceHandler");
@@ -77,6 +81,10 @@
{
System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
}
+ else if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
+ }
else
{
expStr.append(":Inbound:PortHandler");
@@ -101,6 +109,10 @@
{
System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
}
+ else if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
+ }
else
{
expStr.append(":Outbound:LogicalSourceHandler");
@@ -118,6 +130,10 @@
{
System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
}
+ else if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
+ }
else
{
expStr.append(":Inbound:PortHandler");
17 years, 1 month
JBossWS SVN: r5175 - stack/native/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-04 10:02:56 -0500 (Tue, 04 Dec 2007)
New Revision: 5175
Modified:
stack/native/trunk/version.properties
Log:
jbossws-common=snapshot
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2007-12-04 14:55:27 UTC (rev 5174)
+++ stack/native/trunk/version.properties 2007-12-04 15:02:56 UTC (rev 5175)
@@ -25,7 +25,7 @@
# Dependend integration projects
jbossws-spi=1.0.0.GA
-jbossws-common=1.0.2.GA
+jbossws-common=snapshot
jbossws-framework=2.0.2.GA
jbossws-jboss40=4.0.5.GA
jbossws-jboss42=4.2.1.GA
17 years, 1 month
JBossWS SVN: r5174 - in framework/trunk: src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-04 09:55:27 -0500 (Tue, 04 Dec 2007)
New Revision: 5174
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
framework/trunk/version.properties
Log:
Rename XFire to CXF
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-12-04 14:49:38 UTC (rev 5173)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-12-04 14:55:27 UTC (rev 5174)
@@ -54,7 +54,7 @@
public void testEJB3Endpoint() throws Exception
{
- if (isIntegrationXFire())
+ if (isIntegrationCXF())
{
System.out.println("FIXME: [JBWS-1746] - Add support for configurable invoker in cxf.xml");
System.out.println("FIXME: [JBWS-1655] - Add support for endpoint address rewriting");
Modified: framework/trunk/version.properties
===================================================================
--- framework/trunk/version.properties 2007-12-04 14:49:38 UTC (rev 5173)
+++ framework/trunk/version.properties 2007-12-04 14:55:27 UTC (rev 5174)
@@ -14,7 +14,7 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions
-jbossws-common=1.0.0.GA
+jbossws-common=snapshot
jbossws-spi=1.0.0.GA
dom4j=1.6.1
17 years, 1 month
JBossWS SVN: r5173 - common/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-04 09:49:38 -0500 (Tue, 04 Dec 2007)
New Revision: 5173
Modified:
common/trunk/version.properties
Log:
version.id=1.0.3.GA
Modified: common/trunk/version.properties
===================================================================
--- common/trunk/version.properties 2007-12-04 14:48:29 UTC (rev 5172)
+++ common/trunk/version.properties 2007-12-04 14:49:38 UTC (rev 5173)
@@ -5,7 +5,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=1.0.1.GA
+version.id=1.0.3.GA
repository.id=snapshot
implementation.url=http://www.jboss.org/products/jbossws
17 years, 1 month
JBossWS SVN: r5172 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-04 09:48:29 -0500 (Tue, 04 Dec 2007)
New Revision: 5172
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
Rename XFire to CXF
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2007-12-04 14:31:34 UTC (rev 5171)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2007-12-04 14:48:29 UTC (rev 5172)
@@ -92,9 +92,9 @@
return delegate.isIntegrationSunRI();
}
- public boolean isIntegrationXFire()
+ public boolean isIntegrationCXF()
{
- return delegate.isIntegrationXFire();
+ return delegate.isIntegrationCXF();
}
/** Deploy the given archive
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-12-04 14:31:34 UTC (rev 5171)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-12-04 14:48:29 UTC (rev 5172)
@@ -105,7 +105,7 @@
return vendor.indexOf("Sun") != -1;
}
- public boolean isIntegrationXFire()
+ public boolean isIntegrationCXF()
{
String vendor = getImplementationVendor();
return vendor.indexOf("Apache") != -1;
17 years, 1 month
JBossWS SVN: r5171 - stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-04 09:31:34 -0500 (Tue, 04 Dec 2007)
New Revision: 5171
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
Log:
sequence acknowledgement in the form of piggy-backing
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-12-04 13:48:45 UTC (rev 5170)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-12-04 14:31:34 UTC (rev 5171)
@@ -295,6 +295,11 @@
List<QName> outMsgs = new LinkedList<QName>();
outMsgs.add(RMProvider.get().getConstants().getSequenceQName());
outMsgs.add(RMProvider.get().getConstants().getAckRequestedQName());
+ if (wsrmSequence.isAckRequested())
+ {
+ // piggy backing
+ outMsgs.add(RMProvider.get().getConstants().getSequenceAcknowledgementQName());
+ }
rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, wsrmSequence);
reqContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
17 years, 1 month
JBossWS SVN: r5170 - framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-04 08:48:45 -0500 (Tue, 04 Dec 2007)
New Revision: 5170
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
Log:
Fix typo
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-12-04 13:46:29 UTC (rev 5169)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-12-04 13:48:45 UTC (rev 5170)
@@ -116,7 +116,7 @@
URL endpointAddress = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-payload/" + target);
Service service = Service.create(serviceName);
- service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, + endpointAddress.toExternalForm());
+ service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, endpointAddress.toExternalForm());
Dispatch<Source> dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD);
return dispatch;
17 years, 1 month
JBossWS SVN: r5169 - in framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples: webserviceref and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-04 08:46:29 -0500 (Tue, 04 Dec 2007)
New Revision: 5169
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java
Log:
Remove EJB3 extension RemoteBinding, because it is not compatible accross container versions
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.java 2007-12-04 13:30:00 UTC (rev 5168)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.java 2007-12-04 13:46:29 UTC (rev 5169)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.samples.serviceref;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.logging.Logger;
import javax.ejb.Remote;
@@ -35,9 +34,7 @@
import java.util.ArrayList;
@Remote(EJBRemote.class)
-@RemoteBinding(jndiBinding = "/ejb/EJBClient")
@Stateless
-
public class EJBClient
{
// Provide logging
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java 2007-12-04 13:30:00 UTC (rev 5168)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java 2007-12-04 13:46:29 UTC (rev 5169)
@@ -30,12 +30,10 @@
import javax.xml.ws.WebServiceRef;
import javax.xml.ws.WebServiceRefs;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.logging.Logger;
// standard EJB3 annotations
@Remote(EJB3Remote.class)
-@RemoteBinding(jndiBinding = "/ejb3/EJB3Client")
@Stateless
// Test on type with wsdlLocation
17 years, 1 month
JBossWS SVN: r5168 - in stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm: transport and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-04 08:30:00 -0500 (Tue, 04 Dec 2007)
New Revision: 5168
Removed:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceManager.java
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelRequest.java
Log:
proxy instance is not thread safe - thus removing sequence manager thread
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-12-04 13:21:58 UTC (rev 5167)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-12-04 13:30:00 UTC (rev 5168)
@@ -188,7 +188,6 @@
synchronized (lock)
{
this.client = client;
- RMSequenceManager.getInstance().register(this);
}
}
@@ -239,7 +238,6 @@
{
this.client.setWSRMSequence(null);
this.discarded = true;
- RMSequenceManager.getInstance().unregister(this);
}
finally
{
@@ -306,7 +304,6 @@
requestContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
// call stub method
this.client.invoke(operationQName, new Object[] {}, client.getBindingProvider().getResponseContext());
- //RMSequenceManager.getInstance().unregister(this); // TODO: each sequence will be unregistered by sequence manager
}
catch (Exception e)
{
@@ -316,23 +313,14 @@
public final void sendCloseMessage()
{
- /*
synchronized (lock)
{
while (this.isAckRequested())
{
- try
- {
- logger.debug("Waiting till all inbound sequence acknowledgements will be sent");
- lock.wait(100);
- }
- catch (InterruptedException ie)
- {
- logger.warn(ie.getMessage(), ie);
- }
+ logger.debug("Waiting till all inbound sequence acknowledgements will be sent");
+ sendSequenceAcknowledgementMessage();
}
}
- */
Map<String, Object> wsrmReqCtx = new HashMap<String, Object>();
wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, false);
this.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx);
@@ -342,11 +330,14 @@
public final void sendTerminateMessage()
{
sendMessage(RMConstant.TERMINATE_SEQUENCE_WSA_ACTION, wsrmConstants.getTerminateSequenceQName());
- RMSequenceManager.getInstance().unregister(this);
}
public final void sendSequenceAcknowledgementMessage()
{
+ Map<String, Object> wsrmReqCtx = new HashMap<String, Object>();
+ wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, true);
+ this.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx);
+ ackRequested(false);
sendMessage(RMConstant.SEQUENCE_ACKNOWLEDGEMENT_WSA_ACTION, wsrmConstants.getSequenceAcknowledgementQName());
}
Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceManager.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceManager.java 2007-12-04 13:21:58 UTC (rev 5167)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceManager.java 2007-12-04 13:30:00 UTC (rev 5168)
@@ -1,142 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.extensions.wsrm;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.jboss.logging.Logger;
-
-/**
- * TODO: Add comment
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Nov 26, 2007
- */
-public final class RMSequenceManager implements Runnable
-{
- private static final Logger logger = Logger.getLogger(RMSequenceManager.class);
-
- private static RMSequenceManager instance;
- private static final Lock classLock = new ReentrantLock();
- private final Object instanceLock = new Object();
- private final List<RMSequenceImpl> sequences = new LinkedList<RMSequenceImpl>();
- private AtomicBoolean destroyed = new AtomicBoolean();
-
- private RMSequenceManager()
- {
- // hidden constructor
- }
-
- public static RMSequenceManager getInstance()
- {
- classLock.lock();
- try
- {
- if (instance == null)
- {
- instance = new RMSequenceManager();
- new Thread(instance, "RMSequenceManager").start();
- logger.debug("started");
- }
- return instance;
- }
- finally
- {
- classLock.unlock();
- }
- }
-
- public void register(RMSequenceImpl sequence)
- {
- synchronized (instanceLock)
- {
- this.sequences.add(sequence);
- }
- }
-
- public void unregister(RMSequenceImpl sequence)
- {
- synchronized (instanceLock)
- {
- this.sequences.remove(sequence);
- if (this.sequences.size() == 0)
- this.shutdown();
- }
- }
-
- public void run()
- {
- while (destroyed.get() == false)
- {
- synchronized (instanceLock)
- {
- for (RMSequenceImpl sequence : sequences)
- {
- logger.debug("Processing outbound sequence " + sequence.getOutboundId());
- /*
- if (sequence.isAckRequested())
- {
- logger.debug("Sending ack for inbound sequence " + sequence.getInboundId());
- Map<String, Object> wsrmReqCtx = new HashMap<String, Object>();
- wsrmReqCtx.put(RMConstant.ONE_WAY_OPERATION, true);
- sequence.getBindingProvider().getRequestContext().put(RMConstant.REQUEST_CONTEXT, wsrmReqCtx);
- sequence.sendSequenceAcknowledgementMessage();
- sequence.ackRequested(false);
- }
- */
- }
- }
-
- try
- {
- logger.debug("sleeping for 10 miliseconds");
- Thread.sleep(10);
- }
- catch (InterruptedException ie)
- {
- logger.warn(ie);
- }
- }
- }
-
- public void shutdown()
- {
- classLock.lock();
- try
- {
- instance = null;
- this.destroyed.set(true);
- logger.debug("destroyed");
- }
- finally
- {
- classLock.unlock();
- }
- }
-}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelRequest.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelRequest.java 2007-12-04 13:21:58 UTC (rev 5167)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelRequest.java 2007-12-04 13:30:00 UTC (rev 5168)
@@ -107,7 +107,14 @@
}
else
{
- rmResponse = (RMMessage)client.invoke(rmRequest.getPayload(), remotingInvocationContext);
+ Object retVal = client.invoke(rmRequest.getPayload(), remotingInvocationContext);
+ if ((null != retVal) && (false == (retVal instanceof RMMessage)))
+ {
+ String msg = retVal.getClass().getName() + ": '" + retVal + "'";
+ logger.warn(msg);
+ throw new RuntimeException(msg);
+ }
+ rmResponse = (RMMessage)retVal;
}
// Disconnect the remoting client
17 years, 1 month
JBossWS SVN: r5167 - stack/metro/branches.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-12-04 08:21:58 -0500 (Tue, 04 Dec 2007)
New Revision: 5167
Added:
stack/metro/branches/hbraun/
Log:
restart user branch
Copied: stack/metro/branches/hbraun (from rev 5166, stack/metro/trunk)
17 years, 1 month