[jboss-svn-commits] JBL Code SVN: r37238 - labs/jbossesb/trunk/product/services/jbrules/aop/java/org/jboss/internal/soa/esb/services/drools/aspect.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2011-07-05 15:50:05 -0400 (Tue, 05 Jul 2011)
New Revision: 37238

Modified:
   labs/jbossesb/trunk/product/services/jbrules/aop/java/org/jboss/internal/soa/esb/services/drools/aspect/DroolsReteooFactHandleFactoryAspect.java
Log:
JBESB-3623
Add checks for additional NullPointerExceptions in aspect for ReteooFactHandleFactory.


Modified: labs/jbossesb/trunk/product/services/jbrules/aop/java/org/jboss/internal/soa/esb/services/drools/aspect/DroolsReteooFactHandleFactoryAspect.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbrules/aop/java/org/jboss/internal/soa/esb/services/drools/aspect/DroolsReteooFactHandleFactoryAspect.java	2011-07-05 19:48:45 UTC (rev 37237)
+++ labs/jbossesb/trunk/product/services/jbrules/aop/java/org/jboss/internal/soa/esb/services/drools/aspect/DroolsReteooFactHandleFactoryAspect.java	2011-07-05 19:50:05 UTC (rev 37238)
@@ -38,7 +38,7 @@
     /* (non-Javadoc)
      * @see org.drools.reteoo.FactHandleFactory#newFactHandle(long)
      */
-    public final InternalFactHandle newFactHandle(final MethodInvocation invocation) { 
+    public final InternalFactHandle newFactHandle(final MethodInvocation invocation) {
 	final Object[] args = invocation.getArguments();
 	final int id = ((Integer) args[0]).intValue();
 	final Object object = (Object) args[1];
@@ -50,7 +50,7 @@
         if ( conf != null && conf.isEvent() ) {
             TypeDeclaration type = conf.getTypeDeclaration();
             long timestamp;
-            if ((type.getTimestampExtractor() != null ) && ( type.getTimestampExtractor().getExtractToClass() != null) ) {
+            if ((type != null) && (type.getTimestampExtractor() != null ) && ( type.getTimestampExtractor().getExtractToClass() != null) ) {
                 if ( Date.class.isAssignableFrom( type.getTimestampExtractor().getExtractToClass() ) ) {
                     timestamp = ((Date) type.getTimestampExtractor().getValue( workingMemory,
                                                                                object )).getTime();
@@ -62,7 +62,7 @@
                 timestamp = workingMemory.getTimerService().getCurrentTime();
             }
             long duration = 0;
-            if ( type.getDurationExtractor() != null ) {
+            if ((type!=null) && ( type.getDurationExtractor() != null)) {
                 duration = type.getDurationExtractor().getLongValue( workingMemory,
                                                                      object );
             }