Author: chatellier Date: 2009-09-11 10:16:31 +0000 (Fri, 11 Sep 2009) New Revision: 2600 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java Log: Throw runtime exception if there is no trace object in context. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-09-11 10:13:35 UTC (rev 2599) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-09-11 10:16:31 UTC (rev 2600) @@ -39,6 +39,7 @@ import org.codehaus.aspectwerkz.joinpoint.MethodRtti; import org.codehaus.aspectwerkz.joinpoint.MethodSignature; +import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; /** @@ -83,6 +84,11 @@ fr.ifremer.isisfish.util.Trace result = (fr.ifremer.isisfish.util.Trace) context .getValue(fr.ifremer.isisfish.util.Trace.class.getName()); + + if (result == null) { + throw new IsisFishRuntimeException("No trace object found in context"); + } + return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2009-09-11 10:13:35 UTC (rev 2599) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2009-09-11 10:16:31 UTC (rev 2600) @@ -34,6 +34,7 @@ import org.codehaus.aspectwerkz.joinpoint.JoinPoint; import org.codehaus.aspectwerkz.joinpoint.MethodSignature; +import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.simulator.SimulationContext; /** @@ -79,6 +80,11 @@ fr.ifremer.isisfish.util.Trace result = (fr.ifremer.isisfish.util.Trace) context .getValue(fr.ifremer.isisfish.util.Trace.class.getName()); + + if (result == null) { + throw new IsisFishRuntimeException("No trace object found in context"); + } + return result; }