[Laszlo-checkins] r11758 - openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler

[dda@openlaszlo.org]

Author: dda
Date: 2008-11-13 11:54:51 -0800 (Thu, 13 Nov 2008)
New Revision: 11758

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java
Log:
Change 20081112-dda-r by dda at lester.local on 2008-11-12 15:47:49 EST
    in /Users/dda/laszlo/src/svn/openlaszlo/trunk-b/test
    for http://svn.openlaszlo.org/openlaszlo/trunk/test

Summary: Fix for lzsourceannotations

New Features:

Bugs Fixed: LPP-7242 (Added source locators when 'hdebug' property is on)

Technical Reviewer: ptw (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
   Handle case where canvas is null.

Tests:
   To be tested by Ahti



Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java	2008-11-13 19:54:33 UTC (rev 11757)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.java	2008-11-13 19:54:51 UTC (rev 11758)
@@ -467,7 +467,6 @@
             writer.close();
             
             Canvas canvas = env.getCanvas();
-            canvas.setBacktrace(backtraceValue);
             if (!errors.isEmpty()) {
                 if (canvas != null) {
                     canvas.setCompilationWarningText(
@@ -478,6 +477,7 @@
                 System.err.println(errors.toCompilationError().getMessage());
             }
             if (canvas != null) {
+              canvas.setBacktrace(backtraceValue);
               // set file path (relative to webapp) in canvas
               canvas.setFilePath(FileUtils.relativePath(file, LPS.HOME()));
             }