Repository: flex-falcon Updated Branches: refs/heads/develop 4001218ea -> ec234f3fb
- Fixed all blocker issues related to catching of Error or Throwables (Errors are irrecoverable errors that should not be handled at all and Throwable includes Errors) Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ec234f3f Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ec234f3f Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ec234f3f Branch: refs/heads/develop Commit: ec234f3fbec3ce51a81288bb47d09e12c50a2e64 Parents: 4001218 Author: Christofer Dutz <[email protected]> Authored: Tue Jun 28 17:21:52 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Tue Jun 28 17:21:52 2016 +0200 ---------------------------------------------------------------------- .../flex/compiler/common/VersionInfo.java | 8 +++--- .../flex/compiler/config/Configuration.java | 2 +- .../internal/as/codegen/ABCGenerator.java | 4 +-- .../embedding/transcoders/ImageTranscoder.java | 6 ++--- .../embedding/transcoders/JPEGTranscoder.java | 4 +-- .../internal/fxg/dom/GraphicContentNode.java | 2 +- .../internal/fxg/logging/SystemLogger.java | 2 +- .../internal/fxg/sax/FXGSAXScanner.java | 4 +-- .../internal/mxml/MXMLManifestManager.java | 2 +- .../internal/parsing/as/ASDocTokenizer.java | 5 ---- .../internal/parsing/as/BaseASParser.java | 4 +-- .../internal/parsing/as/MetadataTokenizer.java | 4 --- .../internal/parsing/mxml/MXMLTokenizer.java | 6 ----- .../internal/semantics/SemanticUtils.java | 2 +- .../internal/tree/mxml/MXMLTreeBuilder.java | 4 +-- .../internal/units/MXMLCompilationUnit.java | 2 +- .../units/ResourceBundleCompilationUnit.java | 2 +- .../units/ResourceModuleCompilationUnit.java | 4 +-- .../internal/units/requests/RequestMaker.java | 13 ++++++---- .../ImproperlyConfiguredTargetProblem.java | 14 +--------- .../problems/InternalCompilerProblem.java | 27 +++++++++++++------- .../config/ServicesDependenciesWrapper.java | 11 ++++---- .../main/java/flex2/compiler/io/FileUtil.java | 4 +-- .../src/main/java/flex2/tools/VersionInfo.java | 4 +-- .../main/java/flex2/tools/oem/Application.java | 8 +++--- 25 files changed, 67 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/common/VersionInfo.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/common/VersionInfo.java b/compiler/src/main/java/org/apache/flex/compiler/common/VersionInfo.java index 3c1c2af..99a4194 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/common/VersionInfo.java +++ b/compiler/src/main/java/org/apache/flex/compiler/common/VersionInfo.java @@ -131,11 +131,11 @@ public class VersionInfo } } - catch (Throwable t) + catch (Exception e) { if (Trace.error) { - t.printStackTrace(); + e.printStackTrace(); } BUILD_MESSAGE = "build information unavailable"; } @@ -181,11 +181,11 @@ public class VersionInfo BUILD_NUMBER_STRING = build; } } - catch (Throwable t) + catch (Exception e) { if (Trace.error) { - t.printStackTrace(); + e.printStackTrace(); } } finally http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java index d7f9465..e5e3613 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java +++ b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java @@ -2519,7 +2519,7 @@ public class Configuration { servicesConfigFile = new File(resolvePathStrict(servicesPath, cv)); } - catch (Throwable t) + catch (Exception e) { throw new ConfigurationException.CannotOpen(servicesPath, cv.getVar(), cv.getSource(), cv.getLine()); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/as/codegen/ABCGenerator.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/as/codegen/ABCGenerator.java b/compiler/src/main/java/org/apache/flex/compiler/internal/as/codegen/ABCGenerator.java index 2b2db36..b7cacbb 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/as/codegen/ABCGenerator.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/as/codegen/ABCGenerator.java @@ -170,9 +170,9 @@ public class ABCGenerator implements ICodeGenerator { generatedBytes = emitter.emit(); } - catch ( Throwable cant_generate ) + catch ( Exception e ) { - global_scope.addProblem(new CodegenInternalProblem(root_node, cant_generate)); + global_scope.addProblem(new CodegenInternalProblem(root_node, e)); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/ImageTranscoder.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/ImageTranscoder.java b/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/ImageTranscoder.java index 9295001..79e1351 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/ImageTranscoder.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/ImageTranscoder.java @@ -135,9 +135,9 @@ public class ImageTranscoder extends ScalableTranscoder { imageInfo = getImageInfo(bytes, problems); } - catch (Throwable t) + catch (Exception e) { - problems.add(new EmbedExceptionWhileTranscodingProblem(t)); + problems.add(new EmbedExceptionWhileTranscodingProblem(e)); return null; } } @@ -167,7 +167,7 @@ public class ImageTranscoder extends ScalableTranscoder return symbolTags; } - protected ImageInfo getImageInfo(byte[] bytes, Collection<ICompilerProblem> problems) throws Throwable + protected ImageInfo getImageInfo(byte[] bytes, Collection<ICompilerProblem> problems) throws Exception { // TODO This gets the image and width of the image. // Need to remove this and come up with a way to get the dimensions http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/JPEGTranscoder.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/JPEGTranscoder.java b/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/JPEGTranscoder.java index e7b47bf..1b052b5 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/JPEGTranscoder.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/embedding/transcoders/JPEGTranscoder.java @@ -133,9 +133,9 @@ public class JPEGTranscoder extends ImageTranscoder jpegBytes = bufferedImageToJPEG(imageInfo, pixels); } - catch (Throwable t) + catch (Exception e) { - problems.add(new EmbedExceptionWhileTranscodingProblem(t)); + problems.add(new EmbedExceptionWhileTranscodingProblem(e)); return null; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/dom/GraphicContentNode.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/dom/GraphicContentNode.java b/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/dom/GraphicContentNode.java index 7978700..ab4465c 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/dom/GraphicContentNode.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/dom/GraphicContentNode.java @@ -534,7 +534,7 @@ public abstract class GraphicContentNode extends AbstractFXGNode // Add child matrix to the node. this.addChild(matrixNode, problems); } - catch (Throwable t) + catch (Exception e) { problems.add(new FXGInvalidChildMatrixNodeProblem(mask.getDocumentPath(), mask.getStartLine(), mask.getStartColumn())); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/logging/SystemLogger.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/logging/SystemLogger.java b/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/logging/SystemLogger.java index 7470196..09b9201 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/logging/SystemLogger.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/logging/SystemLogger.java @@ -73,7 +73,7 @@ public class SystemLogger extends AbstractLogger ps.println(sb.toString()); } - catch (Throwable ex) + catch (Exception ex) { } finally http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/sax/FXGSAXScanner.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/sax/FXGSAXScanner.java b/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/sax/FXGSAXScanner.java index 4e26544..5541630 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/sax/FXGSAXScanner.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/fxg/sax/FXGSAXScanner.java @@ -466,9 +466,9 @@ public class FXGSAXScanner extends DefaultHandler } } } - catch (Throwable t) + catch (Exception e) { - problems.add(new FXGScanningProblem(documentPath, startLine, startColumn, t.getLocalizedMessage())); + problems.add(new FXGScanningProblem(documentPath, startLine, startColumn, e.getLocalizedMessage())); } if (node != null) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLManifestManager.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLManifestManager.java b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLManifestManager.java index 7ea88b6..13833be 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLManifestManager.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLManifestManager.java @@ -226,7 +226,7 @@ public class MXMLManifestManager implements IMXMLManifestManager documentBuilderFactory.setIgnoringComments(true); manifestDocument = documentBuilderFactory.newDocumentBuilder().parse(new InputSource(manifestFileSpec.createReader())); } - catch (Throwable e) + catch (Exception e) { // TODO Report a problem. } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/ASDocTokenizer.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/ASDocTokenizer.java b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/ASDocTokenizer.java index d9fe49d..f6c06ba 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/ASDocTokenizer.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/ASDocTokenizer.java @@ -65,11 +65,6 @@ public class ASDocTokenizer needToken = true; problems.add(new InternalCompilerProblem(e)); } - catch (Error e) - { - needToken = true; - problems.add(new InternalCompilerProblem(e)); - } } if (token == null) return null; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java index 83c9084..e630504 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/BaseASParser.java @@ -299,9 +299,9 @@ abstract class BaseASParser extends LLkParser implements IProblemReporter // are combined. node.addProblem(new FileNotFoundProblem(e.getMessage())); } - catch (Throwable e2) + catch (Exception e) { - ICompilerProblem problem = new InternalCompilerProblem2(spec.getPath(), e2, SUB_SYSTEM); + ICompilerProblem problem = new InternalCompilerProblem2(spec.getPath(), e, SUB_SYSTEM); node.addProblem(problem); } finally http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/MetadataTokenizer.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/MetadataTokenizer.java b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/MetadataTokenizer.java index fd1b4b9..c23d48f 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/MetadataTokenizer.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/as/MetadataTokenizer.java @@ -135,10 +135,6 @@ public class MetadataTokenizer { needToken = true; } - catch (Error e) - { - needToken = true; - } if (token == null) return null; switch (token.getType()) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java index 14dc8b2..49a3fea 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/parsing/mxml/MXMLTokenizer.java @@ -219,12 +219,6 @@ public class MXMLTokenizer implements IMXMLTokenizer, Closeable problems.add(problem); return null; } - catch (Error e) - { - ICompilerProblem problem = new InternalCompilerProblem2(path, e, SUB_SYSTEM); - problems.add(problem); - return null; - } } return null; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/semantics/SemanticUtils.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/semantics/SemanticUtils.java b/compiler/src/main/java/org/apache/flex/compiler/internal/semantics/SemanticUtils.java index e47ffb5..eaf0e6c 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/semantics/SemanticUtils.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/semantics/SemanticUtils.java @@ -2957,7 +2957,7 @@ public class SemanticUtils if ( fs != null) file_name = fs.getPath(); } - catch (Throwable no_fs) + catch (Exception e) { // No file specification available, probably // because this node is some kind of syntho. http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLTreeBuilder.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLTreeBuilder.java b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLTreeBuilder.java index c343744..83fff67 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLTreeBuilder.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLTreeBuilder.java @@ -313,10 +313,10 @@ public class MXMLTreeBuilder { fileNode.initialize(this); } - catch (Throwable t) + catch (Exception e) { // Something went wrong, so log it. - ICompilerProblem problem = new UnexpectedExceptionProblem(t); + ICompilerProblem problem = new UnexpectedExceptionProblem(e); addProblem(problem); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/units/MXMLCompilationUnit.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/units/MXMLCompilationUnit.java b/compiler/src/main/java/org/apache/flex/compiler/internal/units/MXMLCompilationUnit.java index 32965c9..bbfa74f 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/units/MXMLCompilationUnit.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/units/MXMLCompilationUnit.java @@ -145,7 +145,7 @@ public class MXMLCompilationUnit extends CompilationUnitBase fileNode.getCSSCompilationSession().cssDocuments.addAll(cssDocumentList); } - catch (Throwable e) + catch (Exception e) { //something went wrong, so log it. problems.add(new UnexpectedExceptionProblem(e)); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/units/ResourceBundleCompilationUnit.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/units/ResourceBundleCompilationUnit.java b/compiler/src/main/java/org/apache/flex/compiler/internal/units/ResourceBundleCompilationUnit.java index ff6c06b..921c20c 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/units/ResourceBundleCompilationUnit.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/units/ResourceBundleCompilationUnit.java @@ -316,7 +316,7 @@ public class ResourceBundleCompilationUnit extends CompilationUnitBase generatedBytes = emitter.emit(); } - catch (Throwable ex) + catch (Exception ex) { problems.add(new CodegenInternalProblem(rootNode, ex)); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/units/ResourceModuleCompilationUnit.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/units/ResourceModuleCompilationUnit.java b/compiler/src/main/java/org/apache/flex/compiler/internal/units/ResourceModuleCompilationUnit.java index a3a679e..d6fee7a 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/units/ResourceModuleCompilationUnit.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/units/ResourceModuleCompilationUnit.java @@ -163,7 +163,7 @@ public class ResourceModuleCompilationUnit extends CompilationUnitBase flexProject.addDependency(this, compUnit, DependencyType.EXPRESSION); } } - catch (Throwable t) + catch (Exception t) { problems.add(new InternalCompilerProblem(t)); } @@ -245,7 +245,7 @@ public class ResourceModuleCompilationUnit extends CompilationUnitBase classGen.finishScript(); generatedBytes = emitter.emit(); } - catch (Throwable ex) + catch (Exception ex) { problems.add(new InternalCompilerProblem(ex)); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/internal/units/requests/RequestMaker.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/units/requests/RequestMaker.java b/compiler/src/main/java/org/apache/flex/compiler/internal/units/requests/RequestMaker.java index 44574e9..47251f0 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/internal/units/requests/RequestMaker.java +++ b/compiler/src/main/java/org/apache/flex/compiler/internal/units/requests/RequestMaker.java @@ -231,12 +231,15 @@ public abstract class RequestMaker<ResultType extends IRequestResult, RequesteeI { throw e; } - catch (Throwable t) + catch (AssertionError ae) { - if (THROW_ASSERTIONS && (t instanceof AssertionError)) - throw (AssertionError)t; - - return getResultForThrowable(u, t); + if (THROW_ASSERTIONS) + throw ae; + return getResultForThrowable(u, ae); + } + catch (Exception e) + { + return getResultForThrowable(u, e); } finally { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/problems/ImproperlyConfiguredTargetProblem.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/problems/ImproperlyConfiguredTargetProblem.java b/compiler/src/main/java/org/apache/flex/compiler/problems/ImproperlyConfiguredTargetProblem.java index ac32ce0..87e9b88 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/problems/ImproperlyConfiguredTargetProblem.java +++ b/compiler/src/main/java/org/apache/flex/compiler/problems/ImproperlyConfiguredTargetProblem.java @@ -35,19 +35,7 @@ public class ImproperlyConfiguredTargetProblem extends InternalCompilerProblem public ImproperlyConfiguredTargetProblem() { - super(makeThrowable()); - } - - private static Throwable makeThrowable() - { - try - { - throw new Error(""); - } - catch (Throwable t) - { - return t; - } + super(Thread.currentThread().getStackTrace()); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/compiler/src/main/java/org/apache/flex/compiler/problems/InternalCompilerProblem.java ---------------------------------------------------------------------- diff --git a/compiler/src/main/java/org/apache/flex/compiler/problems/InternalCompilerProblem.java b/compiler/src/main/java/org/apache/flex/compiler/problems/InternalCompilerProblem.java index 4b6b883..bd1318b 100644 --- a/compiler/src/main/java/org/apache/flex/compiler/problems/InternalCompilerProblem.java +++ b/compiler/src/main/java/org/apache/flex/compiler/problems/InternalCompilerProblem.java @@ -28,19 +28,28 @@ import org.apache.flex.compiler.problems.annotations.ProblemClassification; * reports more information. */ @ProblemClassification(CompilerProblemClassification.INTERNAL_ERROR) -public class InternalCompilerProblem extends CompilerProblem -{ - /** - * - * @param throwable must not be null - */ - public InternalCompilerProblem(Throwable throwable) +public class InternalCompilerProblem extends CompilerProblem { + + public InternalCompilerProblem(Exception exception) + { + this(exception.getStackTrace()); + } + + public InternalCompilerProblem(StackTraceElement[] stackTraceElements) { super(); // Save off the stack trace from the exception/throwable - this.stackTrace = InternalCompilerProblem2.makeStackTrace(throwable); + if(stackTraceElements != null) { + StringBuilder stacktraceBuilder = new StringBuilder(); + for (StackTraceElement stackTraceElement : stackTraceElements) { + stacktraceBuilder.append(stackTraceElement.toString()); + } + this.stackTrace = stacktraceBuilder.toString(); + } else { + this.stackTrace = null; + } } - + public static final String DESCRIPTION = "${stackTrace}"; public static final int errorCode = 1309; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/flex-compiler-oem/src/main/java/flex2/compiler/config/ServicesDependenciesWrapper.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/main/java/flex2/compiler/config/ServicesDependenciesWrapper.java b/flex-compiler-oem/src/main/java/flex2/compiler/config/ServicesDependenciesWrapper.java index cb9f97a..7419f0c 100644 --- a/flex-compiler-oem/src/main/java/flex2/compiler/config/ServicesDependenciesWrapper.java +++ b/flex-compiler-oem/src/main/java/flex2/compiler/config/ServicesDependenciesWrapper.java @@ -63,12 +63,13 @@ public class ServicesDependenciesWrapper { servicesDependenciesInstance = ct.newInstance(arglist); } - catch (Throwable e3) + catch (Exception e3) { - if (e3 instanceof InvocationTargetException) - System.err.println(((InvocationTargetException)e3).getCause()); - else - System.err.println(e3); + if(e3 instanceof InvocationTargetException) { + e3.getCause().printStackTrace(); + } else { + e3.printStackTrace(); + } } } catch (NoSuchMethodException e2) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/flex-compiler-oem/src/main/java/flex2/compiler/io/FileUtil.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/main/java/flex2/compiler/io/FileUtil.java b/flex-compiler-oem/src/main/java/flex2/compiler/io/FileUtil.java index 36729fd..5952441 100644 --- a/flex-compiler-oem/src/main/java/flex2/compiler/io/FileUtil.java +++ b/flex-compiler-oem/src/main/java/flex2/compiler/io/FileUtil.java @@ -46,7 +46,7 @@ public final class FileUtil { return new File(path); } - catch (Error e) // J#.NET throws an error if the file is not found... + catch (Exception e) // J#.NET throws an error if the file is not found... { return null; } @@ -77,7 +77,7 @@ public final class FileUtil { return new File(parentPath, fileName); } - catch (Error e) // J#.NET throws an error if the file is not found... + catch (Exception e) // J#.NET throws an error if the file is not found... { return null; } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/flex-compiler-oem/src/main/java/flex2/tools/VersionInfo.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/main/java/flex2/tools/VersionInfo.java b/flex-compiler-oem/src/main/java/flex2/tools/VersionInfo.java index f1fd1f9..c2d408c 100644 --- a/flex-compiler-oem/src/main/java/flex2/tools/VersionInfo.java +++ b/flex-compiler-oem/src/main/java/flex2/tools/VersionInfo.java @@ -87,7 +87,7 @@ public class VersionInfo BUILD_MESSAGE = "Version " + FLEX_MAJOR_VERSION + "." + FLEX_MINOR_VERSION + "." + FLEX_NANO_VERSION + " build " + buildNum; } - catch (Throwable t) + catch (Exception t) { /* if (Trace.error) @@ -132,7 +132,7 @@ public class VersionInfo } } } - catch (Throwable t) + catch (Exception t) { /* if (Trace.error) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec234f3f/flex-compiler-oem/src/main/java/flex2/tools/oem/Application.java ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/src/main/java/flex2/tools/oem/Application.java b/flex-compiler-oem/src/main/java/flex2/tools/oem/Application.java index 2b6eec4..0edb796 100644 --- a/flex-compiler-oem/src/main/java/flex2/tools/oem/Application.java +++ b/flex-compiler-oem/src/main/java/flex2/tools/oem/Application.java @@ -160,14 +160,14 @@ public class Application implements Builder } }); } - catch (Throwable e) + catch (Exception e) { } // get rid of compiler temp files. for (int i = 0, len = list == null ? 0 : list.length; i < len; i++) { - try { list[i].delete(); } catch (Throwable t) {} + try { list[i].delete(); } catch (Exception t) {} } // use the protection domain to find the location of flex-compiler-oem.jar. @@ -436,9 +436,9 @@ public class Application implements Builder return size; } - catch (Throwable t) + catch (Exception e) { - ThreadLocalToolkit.logError(t.getLocalizedMessage()); + ThreadLocalToolkit.logError(e.getLocalizedMessage()); return 0; } finally
