This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit a77a4fe0c382f8631635b805400a51da25a4709f
Author: Jamie Goodyear <[email protected]>
AuthorDate: Mon Apr 1 16:55:31 2024 -0230

    [CXF-8994] CorbaConduitTest no longer requires IBM JDK destination 
activation routine. (#1780)
    
    (cherry picked from commit 5de2b61f16715cd3bc02d0b986b21dc740d583f0)
---
 .../test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
 
b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index e950a7a92c..630e821571 100644
--- 
a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++ 
b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -116,13 +116,6 @@ public class CorbaConduitTest {
                          "SimpleCORBAPort");
 
         CorbaDestination destination = new CorbaDestination(endpointInfo, 
orbConfig);
-
-        if (System.getProperty("java.vendor").contains("IBM")) {
-            //IBM requires it to activate to resolve it, but cannot
-            //activate on sun without more config
-            destination.activate();
-        }
-
         CorbaConduit conduit = new CorbaConduit(endpointInfo, 
destination.getAddress(), orbConfig);
         CorbaMessage message = new CorbaMessage(new MessageImpl());
         try {
@@ -352,7 +345,7 @@ public class CorbaConduitTest {
 
         org.omg.CORBA.Object obj = mock(org.omg.CORBA.Object.class);
         
when(message.get(CorbaConstants.CORBA_ENDPOINT_OBJECT)).thenReturn(obj);
-        
+
         //msg.put(CorbaConstants.CORBA_ENDPOINT_OBJECT, obj);
         Request r = mock(Request.class);
         NVList nvList = orb.create_list(0);

Reply via email to