Skip to content

Commit

Permalink
[JBWS-4430]:Fix IllegalStateException in CXF interceptor when it trie…
Browse files Browse the repository at this point in the history
…s to access CDI bean
  • Loading branch information
jimma committed Nov 5, 2024
1 parent bc838de commit ccf7413
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.jboss.wsf.stack.cxf.interceptor;

import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;

public abstract class AbstractTCCLPhaseInterceptor<T extends Message> extends AbstractPhaseInterceptor<T> {
public AbstractTCCLPhaseInterceptor(String phase) {
super(null, phase, false);
}

public AbstractTCCLPhaseInterceptor(String i, String p) {
super(i, p, false);
}

public AbstractTCCLPhaseInterceptor(String phase, boolean uniqueId) {
super(null, phase, uniqueId);
}

public AbstractTCCLPhaseInterceptor(String i, String p, boolean uniqueId) {
super(i,p, uniqueId);
}

@Override
public void handleMessage(T message) throws Fault {
ClassLoaderUtils.ClassLoaderHolder origLoader = null;
try {
origLoader = ClassLoaderUtils.setThreadContextClassloader(this.getClass().getClassLoader());
handleMessageWithTCCL(message);
} finally {
origLoader.reset();
}
}
public abstract void handleMessageWithTCCL(T message) throws Fault;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.jboss.test.ws.jaxws.cxf.jbws4430;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.Phase;
import org.jboss.wsf.stack.cxf.interceptor.AbstractTCCLPhaseInterceptor;

public class CDIOutInterceptor extends AbstractTCCLPhaseInterceptor<Message> {
public CDIOutInterceptor() {
super(Phase.PRE_STREAM);
}

@Override
public void handleMessageWithTCCL(Message message) throws Fault {
if (!MessageUtils.isRequestor(message)) {
DelegateBean bean = new DelegateBean();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
package org.jboss.test.ws.jaxws.cxf.jbws4430;

import jakarta.jws.HandlerChain;
import org.apache.cxf.interceptor.OutInterceptors;

@jakarta.jws.WebService(targetNamespace = "http://test.ws.jboss.org/",
wsdlLocation = "WEB-INF/wsdl/HelloWorld.wsdl")
@HandlerChain(file = "/handlers.xml")
@OutInterceptors(interceptors = {"org.jboss.test.ws.jaxws.cxf.jbws4430.CDIOutInterceptor"})
public class HelloBean {
public HelloBean() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public class JBWS4430TestCase extends JBossWSTest {
public static WebArchive createDeployment() {
WebArchive archive = ShrinkWrap.create(WebArchive.class, DEP + ".war");
archive.setManifest(new StringAsset("Manifest-Version: 1.0\n"
+ "Dependencies: org.apache.cxf\n"))
.addClasses(HelloBean.class, DelegateBean.class, EmptyBean.class, LoggingHandler.class)
+ "Dependencies: org.jboss.ws.cxf.jbossws-cxf-server\n"))
.addClasses(HelloBean.class, DelegateBean.class, EmptyBean.class, CDIOutInterceptor.class, LoggingHandler.class)
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws4430/WEB-INF/wsdl/HelloWorld.wsdl"), "wsdl/HelloWorld.wsdl")
.add(new FileAsset(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws4430/handlers.xml")), "WEB-INF/classes/handlers.xml")
.setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws4430/WEB-INF/web.xml"));
Expand Down

0 comments on commit ccf7413

Please sign in to comment.