You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by di...@locus.apache.org on 2000/12/13 17:15:05 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/components/language/programming CompiledProgrammingLanguage.java
dims 00/12/13 08:14:59
Modified: src/org/apache/cocoon/components/language/programming Tag:
xml-cocoon2 CompiledProgrammingLanguage.java
Log:
Adding more possible Exceptions.
Revision Changes Path
No revision
No revision
1.1.2.11 +34 -11 xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java
Index: CompiledProgrammingLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CompiledProgrammingLanguage.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- CompiledProgrammingLanguage.java 2000/12/07 17:10:47 1.1.2.10
+++ CompiledProgrammingLanguage.java 2000/12/13 16:14:54 1.1.2.11
@@ -26,7 +26,7 @@
* and object program files
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/12/07 17:10:47 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/12/13 16:14:54 $
*/
public abstract class CompiledProgrammingLanguage
extends AbstractProgrammingLanguage
@@ -171,19 +171,42 @@
baseDirectory, filename + "." + this.getSourceExtension()
);
- if (sourceFile.exists() && sourceFile.isFile() && sourceFile.canRead()) {
- this.compile(filename, baseDirectory, encoding);
+ if (!sourceFile.exists()) {
+ throw new LanguageException(
+ "Can't load program - File doesn't exist: " +
+ baseDirectory.toString() + File.separator + filename
+ );
+ }
- if (this.deleteSources) {
- sourceFile.delete();
- }
+ if (!sourceFile.isFile()) {
+ throw new LanguageException(
+ "Can't load program - File is not a normal file: " +
+ baseDirectory.toString() + File.separator + filename
+ );
+ }
- return this.loadProgram(filename, baseDirectory);
+ if (!sourceFile.canRead()) {
+ throw new LanguageException(
+ "Can't load program - File cannot be read: " +
+ baseDirectory.toString() + File.separator + filename
+ );
}
- throw new LanguageException(
- "Can't load program: " +
- baseDirectory.toString() + File.separator + filename
- );
+ this.compile(filename, baseDirectory, encoding);
+
+ if (this.deleteSources) {
+ sourceFile.delete();
+ }
+
+ Object program = this.loadProgram(filename, baseDirectory);
+
+ if(program == null) {
+ throw new LanguageException(
+ "Can't load program : " +
+ baseDirectory.toString() + File.separator + filename
+ );
+ }
+
+ return program;
}
}