Author: dda
Date: 2007-12-20 09:15:24 -0800 (Thu, 20 Dec 2007)
New Revision: 7641
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9Generator.java
Log:
Change 20071220-dda-u by [EMAIL PROTECTED] on 2007-12-20 12:11:49 EST
in /Users/dda/laszlo/src/svn/openlaszlo/branches/devildog
for http://svn.openlaszlo.org/openlaszlo/branches/devildog
Summary: SWF9: fixing null pointer error again.
New Features:
Bugs Fixed: LPP-5234
Technical Reviewer: ptw (pending)
QA Reviewer: hminsky (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Fixed null pointer error, and made error messages a little more
consistent (we always now get [/tmp/lzgenxxxx/YYY.as: NNN]: as part of the
message).
Tests:
Compiled against Henry's latest changeset.
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9Generator.java
===================================================================
---
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9Generator.java
2007-12-20 17:15:07 UTC (rev 7640)
+++
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9Generator.java
2007-12-20 17:15:24 UTC (rev 7641)
@@ -555,19 +555,26 @@
// actualSrcLine is the name/linenumber of the actual files
// used in compilation, not the original sources.
- String actualSrcFile = tunit.getSourceFileName();
- if (actualSrcFile == null)
- actualSrcFile = "(" + tunit.getName() + ")";
+ String actualSrcFile = null;
+ if (tunit == null) {
+ actualSrcFile = "(unknown)";
+ }
+ else {
+ actualSrcFile = tunit.getSourceFileName();
+ if (actualSrcFile == null)
+ actualSrcFile = "(" + tunit.getName() + ")";
+ }
String actualSrcLine = actualSrcFile + ": " + err.getLineNumber();
if (tunit == null ||
((srcLine = tunit.originalLineNumber(err.getLineNumber())) <=
0)) {
- srcLineStr = actualSrcLine;
+ srcLineStr = "unknown";
}
else {
// For now, we also show the actual source file/line
- srcLineStr = String.valueOf(srcLine) + " [" + actualSrcLine + "]";
+ srcLineStr = String.valueOf(srcLine);
}
- System.err.println("Compiler error: at " + srcLineStr + ": " +
+ System.err.println("Compiler error: at " + srcLineStr +
+ " [" + actualSrcLine + "]: " +
err.getErrorString() +
"\n " + err.originalErrorString());
}
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
