[Jason-developers] SF.net SVN: jason: [1265] trunk/applications

[<jom...@us...>]

Revision: 1265
          http://jason.svn.sourceforge.net/jason/?rev=1265&view=rev
Author:   jomifred
Date:     2008-04-26 13:32:39 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
fix bug in OrgManager

Modified Paths:
--------------
    trunk/applications/as-unit-test/src/jason/tests/TestAll.java
    trunk/applications/jason-moise/src/jmoise/OrgManager.java

Modified: trunk/applications/as-unit-test/src/jason/tests/TestAll.java
===================================================================
--- trunk/applications/as-unit-test/src/jason/tests/TestAll.java	2008-04-26 14:12:31 UTC (rev 1264)
+++ trunk/applications/as-unit-test/src/jason/tests/TestAll.java	2008-04-26 20:32:39 UTC (rev 1265)
@@ -10,7 +10,8 @@
     BugVarsInInitBels.class,
     TestAddLogExprInBB.class,
     TestGoalSource.class, 
-    TestIF.class, 
+    TestIF.class,
+    TestLoop.class,
     TestKQML.class,
     TestPlanbodyAsTerm.class,
     TestPlanFailure.class,

Modified: trunk/applications/jason-moise/src/jmoise/OrgManager.java
===================================================================
--- trunk/applications/jason-moise/src/jmoise/OrgManager.java	2008-04-26 14:12:31 UTC (rev 1264)
+++ trunk/applications/jason-moise/src/jmoise/OrgManager.java	2008-04-26 20:32:39 UTC (rev 1265)
@@ -133,6 +133,9 @@
         while (i.hasNext()) {
             Message m = i.next();
             i.remove(); // the agent do not receive this message
+            if (currentOE == null) break;
+            if (m.getSender() == null) break;
+            
             OEAgent agSender = currentOE.getAgent(m.getSender());
             if (logger.isLoggable(Level.FINE)) logger.fine("Processing '" + m + "' for " + agSender);
             try {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.