Merge branch 'feature/throw-errors-in-threadpool' into feature/multiple-keys-for-context

Author: AJdeMooij

.gitignore

@@ -17,6 +17,11 @@ bin/
 
 *.prefs
 
+# Eclipse
+.classpath
+.project
+*.swp
+
 # IntelliJ / Idea
 *.idea
 log/

src/org/uu/nl/net2apl/core/deliberation/DeliberationRunnable.java

@@ -50,8 +50,7 @@ public void run(){
 				// If all deliberation steps are finished, then check whether
 				// the agent is done, so it can be killed.
 				if(this.agent.isDone()){
-					agent.getShutdownPlans().forEach( plan -> { try { agent.executePlan(plan); } catch (PlanExecutionError ex) { /*TODO?*/ } } );
-					this.platform.killAgent(this.agent.getAID()); 
+					initiateShutdown(this.agent);
 				} else {
 					if(!this.agent.checkSleeping()){ // If the agents goes to sleep then it will be woken upon any external input (message, external trigger)
 						reschedule();
@@ -62,13 +61,28 @@ public void run(){
 				// killed and removed from the platform. All proxy's are
 				// notified of the agent's death. The rest of the multi-
 				// agent system will continue execution by default.
-				this.platform.killAgent(this.agent.getAID()); 
-			} 
+				Platform.getLogger().log(getClass(), exception);
+				this.platform.killAgent(this.agent.getAID());
+			}
 		} else {
-			agent.getShutdownPlans().forEach( plan -> { try { agent.executePlan(plan); } catch (PlanExecutionError ex) { /*TODO?*/ } } );
-			this.platform.killAgent(this.agent.getAID()); 
+			initiateShutdown(agent);
 		}
-	}  
+	}
+
+	/** Perform shutdown plans, and kill agent **/
+	private void initiateShutdown(Agent agent) {
+		agent.getShutdownPlans().forEach(
+				plan -> {
+					try {
+						agent.executePlan(plan);
+					} catch (PlanExecutionError ex) {
+						Platform.getLogger().log(plan.getClass(), ex);
+						/*TODO?*/
+					}
+				}
+		);
+		this.platform.killAgent(agent.getAID());
+	}
 
 	/** Returns the id of the agent to which this runnable belongs. */
 	public final AgentID getAgentID(){ return this.agent.getAID(); }

src/org/uu/nl/net2apl/core/logging/Loggable.java

@@ -32,6 +32,12 @@ public void log(Class<?> c, Object message) {
 	 * @param ex The exception to log
 	 */
 	public void log(Class<?> c, Exception ex) {
-		log(c, Level.SEVERE, ex.getMessage());
+		String msg = ex.getMessage() == null ? "<No Message>" : ex.getMessage();
+		log(c, Level.SEVERE, msg);
+		if(ex.getStackTrace() != null) {
+			for(StackTraceElement el : ex.getStackTrace()) {
+				log(c, Level.SEVERE, "\t| " + el.toString());
+			}
+		}
 	}
 }