[jbossws-commits] JBossWS SVN: r5455 - in framework/trunk: eclipse and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-01-10 07:21:02 -0500 (Thu, 10 Jan 2008) New Revision: 5455 Modified: framework/trunk/.classpath framework/trunk/eclipse/jbossws.userlibraries framework/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java Log: Prevent NPE when endpoint not set Modified: framework/trunk/.classpath =================================================================== --- framework/trunk/.classpath 2008-01-10 10:45:57 UTC (rev 5454) +++ framework/trunk/.classpath 2008-01-10 12:21:02 UTC (rev 5455) @@ -14,7 +14,7 @@ <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> + <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: framework/trunk/eclipse/jbossws.userlibraries =================================================================== --- framework/trunk/eclipse/jbossws.userlibraries 2008-01-10 10:45:57 UTC (rev 5454) +++ framework/trunk/eclipse/jbossws.userlibraries 2008-01-10 12:21:02 UTC (rev 5455) @@ -33,30 +33,30 @@ <archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA/server/default/lib/jbosssx.jar"/> </library> <library name="jboss-5.0.x" systemlibrary="false"> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-aop-jdk50.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-j2se.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss-javaee.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system-jmx.jar" source="/home/tdiesler/svn/jbossas/trunk/system-jmx/src/main"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-vfs.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss.jar" source="/home/tdiesler/svn/jbossas/trunk/server/src/main"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jnpserver.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-logging-spi.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-xml-binding.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/client/jboss-ejb3-client.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/client/jboss-ejb3-ext-api.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-common-core.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jbosssx.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/ejb3.deployer/jboss-annotations-ejb3.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/ejb3.deployer/jboss-ejb3.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/antlr.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss-security-spi.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-structure-spi.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-core-spi.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-spi.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-client-spi.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-vfs-spi.jar"/> -<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/jbossws.deployer/jbossws-jboss50.jar" source="/home/tdiesler/svn/jbossas/trunk/webservices/src/main"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-aop-jdk50.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-j2se.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/server/default/lib/jboss-javaee.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-system.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-system-jmx.jar" source="/home/tdiesler/svn/jbossas/trunk/system-jmx/src/main"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-vfs.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/server/default/lib/jboss.jar" source="/home/tdiesler/svn/jbossas/trunk/server/src/main"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/server/default/lib/jnpserver.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/server/default/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-logging-spi.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-xml-binding.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/client/jboss-ejb3-client.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/client/jboss-ejb3-ext-api.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-common-core.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/server/default/lib/jbosssx.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/server/default/deployers/ejb3.deployer/jboss-annotations-ejb3.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/server/default/deployers/ejb3.deployer/jboss-ejb3.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/server/default/lib/antlr.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/server/default/lib/jboss-security-spi.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-deployers-structure-spi.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-deployers-core-spi.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-deployers-spi.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-deployers-client-spi.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-deployers-vfs-spi.jar"/> +<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta4/server/default/deployers/jbossws.deployer/jbossws-jboss50.jar" source="/home/tdiesler/svn/jbossas/trunk/webservices/src/main"/> </library> </eclipse-userlibraries> Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2008-01-10 10:45:57 UTC (rev 5454) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2008-01-10 12:21:02 UTC (rev 5455) @@ -64,7 +64,7 @@ protected boolean handleInbound(MessageContext ctx) { Endpoint endpoint = EndpointAssociation.getEndpoint(); - if (this.isRecording(endpoint)) + if (endpoint != null && isRecording(endpoint)) { Record record = RecordFactory.newRecord(); RecordGroupAssociation.pushGroupID(record.getGroupID()); @@ -115,7 +115,7 @@ protected boolean handleOutbound(MessageContext ctx) { Endpoint endpoint = EndpointAssociation.getEndpoint(); - if (this.isRecording(endpoint)) + if (endpoint != null && isRecording(endpoint)) { String groupID = RecordGroupAssociation.popGroupID(); Record record = RecordFactory.newRecord(groupID);