bloritsch 00/12/11 07:06:13
Modified: src/org/apache/cocoon Tag: xml-cocoon2 Main.java
src/org/apache/cocoon/components/classloader Tag:
xml-cocoon2 RepositoryClassLoader.java
src/org/apache/cocoon/components/image Tag: xml-cocoon2
JAIPNGEncoder.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 AbstractMarkupLanguage.java
Logicsheet.java
src/org/apache/cocoon/components/language/programming/java
Tag: xml-cocoon2 JavaLanguage.java Jikes.java
src/org/apache/cocoon/environment/commandline Tag:
xml-cocoon2 CommandLineRequest.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
XSLTFactoryLoader.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
SQLTransformer.java XIncludeTransformer.java
src/org/apache/cocoon/util Tag: xml-cocoon2 IOUtils.java
Log:
Add some declaration scopes for correctness/security. Added some
RuntimeException
handling. I am running J-Test, and the fixes are in response to the
white-box testing
and uncaught runtime exceptions. We need to be carefull about those!!!
Revision Changes Path
No revision
No revision
1.1.4.17 +4 -4 xml-cocoon/src/org/apache/cocoon/Attic/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Main.java,v
retrieving revision 1.1.4.16
retrieving revision 1.1.4.17
diff -u -r1.1.4.16 -r1.1.4.17
--- Main.java 2000/12/07 17:10:30 1.1.4.16
+++ Main.java 2000/12/11 15:05:47 1.1.4.17
@@ -48,7 +48,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.4.16 $ $Date: 2000/12/07 17:10:30 $
+ * @version CVS $Revision: 1.1.4.17 $ $Date: 2000/12/11 15:05:47 $
*/
public class Main {
@@ -363,7 +363,7 @@
return filename;
}
- void resourceUnavailable(File file) throws IOException {
+ private void resourceUnavailable(File file) throws IOException {
PrintStream out = new PrintStream(new FileOutputStream(file));
out.println(
"<html><head><title>Page Not Available</title></head>" +
@@ -375,7 +375,7 @@
out.close();
}
- String mangle(String uri) {
+ private String mangle(String uri) {
log.debug("mangle(\"" + uri + "\")");
if (uri.charAt(uri.length() - 1) == '/') uri += Cocoon.INDEX_URI;
uri = uri.replace('"', '\'');
@@ -384,7 +384,7 @@
return uri;
}
- String leaf(int level) {
+ private String leaf(int level) {
if (level == 0) return "";
return tree(level - 2) + "+--";
}
No revision
No revision
1.1.2.8 +18 -12
xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java
Index: RepositoryClassLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- RepositoryClassLoader.java 2000/12/08 20:38:41 1.1.2.7
+++ RepositoryClassLoader.java 2000/12/11 15:05:49 1.1.2.8
@@ -24,7 +24,7 @@
* A class loader with a growable list of path search directories
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/08 20:38:41 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/12/11 15:05:49 $
*/
class RepositoryClassLoader extends ClassLoader {
/**
@@ -62,28 +62,34 @@
* repository
*/
public void addDirectory(File repository) throws IOException {
- String directoryName = repository.getCanonicalPath();
+ String fullFilename = null;
// Ensure the same directory isn't specified twice
- int count = this.repositories.size();
- String fullFilename = IOUtils.getFullFilename(repository);
- for (int i = 0; i < count; i++) {
- File directory = (File) this.repositories.elementAt(i);
- if (fullFilename.equals(IOUtils.getFullFilename(directory))) {
- return;
- }
+ try {
+ int count = this.repositories.size();
+ fullFilename = IOUtils.getFullFilename(repository);
+
+ for (int i = 0; i < count; i++) {
+ File directory = (File) this.repositories.elementAt(i);
+ if (fullFilename.equals(IOUtils.getFullFilename(directory))) {
+ return;
+ }
+ }
+ } catch (SecurityException se) {
+ log.debug("RepositoryClassLoader:SecurityException", se);
+ throw new IOException("Cannot access directory" + fullFilename);
}
if (!repository.exists()) {
- throw new IOException("Non-existent: " + directoryName);
+ throw new IOException("Non-existent: " + fullFilename);
}
if (!repository.isDirectory()) {
- throw new IOException("Not a directory: " + directoryName);
+ throw new IOException("Not a directory: " + fullFilename);
}
if (!(repository.canRead() && repository.canWrite())) {
- throw new IOException("Not readable/writable: " + directoryName);
+ throw new IOException("Not readable/writable: " + fullFilename);
}
this.repositories.addElement(repository);
No revision
No revision
1.1.2.7 +5 -0
xml-cocoon/src/org/apache/cocoon/components/image/Attic/JAIPNGEncoder.java
Index: JAIPNGEncoder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/image/Attic/JAIPNGEncoder.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- JAIPNGEncoder.java 2000/11/26 21:48:02 1.1.2.6
+++ JAIPNGEncoder.java 2000/12/11 15:05:51 1.1.2.7
@@ -49,6 +49,11 @@
}
public void encode(BufferedImage image, OutputStream out) throws
IOException {
+ if (image == null || out == null) {
+ log.error("You should never get this: Image is null and/or
OutputStream is null");
+ throw new IOException("You cannot serialize a null image and/or
to a null stream");
+ }
+
PNGEncodeParam param = PNGEncodeParam.getDefaultEncodeParam(image);
// Set the alpha (defaults to on)
if (!alpha)
No revision
No revision
1.1.2.19 +14 -12
xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- ProgramGeneratorImpl.java 2000/12/08 20:38:46 1.1.2.18
+++ ProgramGeneratorImpl.java 2000/12/11 15:05:54 1.1.2.19
@@ -53,7 +53,7 @@
* The default implementation of <code>ProgramGenerator</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2000/12/08 20:38:46 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2000/12/11 15:05:54 $
*/
public class ProgramGeneratorImpl
implements ProgramGenerator, Composer, Configurable, ThreadSafe
@@ -67,7 +67,7 @@
protected MemoryStore cache = new MemoryStore();
/** The component manager */
- protected ComponentManager manager;
+ protected ComponentManager manager = null;
/** The markup language component selector */
protected ComponentSelector markupSelector;
@@ -86,17 +86,19 @@
* @param manager The global component manager
*/
public void compose(ComponentManager manager) {
- this.manager = manager;
+ if ((this.manager == null) && (manager != null)) {
+ this.manager = manager;
- try {
- log.debug("Lookup " + Roles.MARKUP_LANGUAGE);
- this.markupSelector = (ComponentSelector)
this.manager.lookup(Roles.MARKUP_LANGUAGE);
- log.debug("Lookup " + Roles.PROGRAMMING_LANGUAGE);
- this.languageSelector = (ComponentSelector)
this.manager.lookup(Roles.PROGRAMMING_LANGUAGE);
- log.debug("Lookup " + Roles.COCOON);
- this.workDir = ((Cocoon)
this.manager.lookup(Roles.COCOON)).getWorkDir();
- } catch (Exception e) {
- log.warn("Could not lookup Component", e);
+ try {
+ log.debug("Lookup " + Roles.MARKUP_LANGUAGE);
+ this.markupSelector = (ComponentSelector)
this.manager.lookup(Roles.MARKUP_LANGUAGE);
+ log.debug("Lookup " + Roles.PROGRAMMING_LANGUAGE);
+ this.languageSelector = (ComponentSelector)
this.manager.lookup(Roles.PROGRAMMING_LANGUAGE);
+ log.debug("Lookup " + Roles.COCOON);
+ this.workDir = ((Cocoon)
this.manager.lookup(Roles.COCOON)).getWorkDir();
+ } catch (Exception e) {
+ log.warn("Could not lookup Component", e);
+ }
}
}
No revision
No revision
1.1.2.14 +6 -1
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- AbstractMarkupLanguage.java 2000/12/08 20:38:51 1.1.2.13
+++ AbstractMarkupLanguage.java 2000/12/11 15:05:55 1.1.2.14
@@ -50,7 +50,7 @@
* be decoupled from this context!!!
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2000/12/08 20:38:51 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2000/12/11 15:05:55 $
*/
public abstract class AbstractMarkupLanguage
implements MarkupLanguage, Composer, Configurable
@@ -316,6 +316,11 @@
{
String systemId = null;
InputSource inputSource = null;
+
+ if (codeGenerator == null) {
+ log.debug("This should never happen: codeGenerator is null");
+ throw new SAXException("codeGenerator must never be null.");
+ }
if (logicsheetLocation.indexOf(":/") < 0) { // Relative to Cocoon
root
inputSource = entityResolver.resolveEntity(null,
logicsheetLocation);
1.1.2.10 +5 -3
xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/Logicsheet.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Logicsheet.java 2000/11/30 21:40:56 1.1.2.9
+++ Logicsheet.java 2000/12/11 15:05:56 1.1.2.10
@@ -51,7 +51,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/11/30 21:40:56 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/12/11 15:05:56 $
*/
public class Logicsheet {
/**
@@ -96,8 +96,10 @@
{
try {
return tfactory.newTransformerHandler(templates);
- } catch (TransformerConfigurationException e){
- log.error("Logicsheet.getTransformerHandler", e);
+ } catch (TransformerConfigurationException e) {
+
log.error("Logicsheet.getTransformerHandler:TransformerConfigurationException",
e);
+ } catch (Exception e) {
+ log.error("Logicsheet.getTransformerHandler:Exception", e);
}
return null;
}
No revision
No revision
1.1.2.16 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- JavaLanguage.java 2000/12/08 20:39:16 1.1.2.15
+++ JavaLanguage.java 2000/12/11 15:06:02 1.1.2.16
@@ -31,12 +31,12 @@
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2000/12/08 20:39:16 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2000/12/11 15:06:02 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe {
/** The class loader */
- ClassLoaderManager classLoaderManager;
+ private ClassLoaderManager classLoaderManager;
/**
* Return the language name
1.1.2.8 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Jikes.java
Index: Jikes.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Jikes.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Jikes.java 2000/12/08 20:39:17 1.1.2.7
+++ Jikes.java 2000/12/11 15:06:02 1.1.2.8
@@ -16,7 +16,7 @@
* This class wraps IBM's <i>Jikes</i> Java compiler
* NOTE: inspired by the Apache Jasper implementation.
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.7 $ $Date: 2000/12/08 20:39:17 $
+ * @version $Revision: 1.1.2.8 $ $Date: 2000/12/11 15:06:02 $
* @since 2.0
*/
@@ -25,7 +25,7 @@
static final int OUTPUT_BUFFER_SIZE = 1024;
static final int BUFFER_SIZE = 512;
- class StreamPumper extends Thread {
+ private class StreamPumper extends Thread {
private BufferedInputStream stream;
private boolean endOfStream = false;
No revision
No revision
1.1.2.7 +12 -12
xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/CommandLineRequest.java
Index: CommandLineRequest.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/environment/commandline/Attic/CommandLineRequest.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- CommandLineRequest.java 2000/12/05 22:02:02 1.1.2.6
+++ CommandLineRequest.java 2000/12/11 15:06:05 1.1.2.7
@@ -29,7 +29,7 @@
* Creates a specific servlet request simulation from command line usage.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/12/05 22:02:02 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/11 15:06:05 $
*/
/*
@@ -38,7 +38,7 @@
*/
public class CommandLineRequest implements HttpServletRequest {
- class IteratorWrapper implements Enumeration {
+ private class IteratorWrapper implements Enumeration {
private Iterator iterator;
public IteratorWrapper(Iterator i) {
this.iterator = i;
@@ -70,7 +70,7 @@
public CommandLineRequest(String contextPath, String servletPath, String
pathInfo, Map attributes, Map parameters) {
this(contextPath, servletPath, pathInfo, attributes, parameters,
null);
}
-
+
public CommandLineRequest(String contextPath, String servletPath, String
pathInfo, Map attributes, Map parameters, Map headers) {
this.contextPath = contextPath;
this.servletPath = servletPath;
@@ -83,7 +83,7 @@
public String getContextPath() { return contextPath; }
public String getServletPath() { return servletPath; }
public String getPathInfo() { return pathInfo; }
- public String getRequestURI() {
+ public String getRequestURI() {
StringBuffer buffer = new StringBuffer();
if (servletPath != null) buffer.append(servletPath);
if (contextPath != null) buffer.append(contextPath);
@@ -96,37 +96,37 @@
public Object getAttribute(String name) {
return (attributes != null) ? attributes.get(name) : null;
}
- public Enumeration getAttributeNames() {
+ public Enumeration getAttributeNames() {
return (attributes != null) ? new
IteratorWrapper(attributes.keySet().iterator()) : null;
}
- public void setAttribute(String name, Object value) {
+ public void setAttribute(String name, Object value) {
if (attributes != null) attributes.put(name, value);
}
public void removeAttribute(String name) {
if (attributes != null) attributes.remove(name);
}
- public String getParameter(String name) {
+ public String getParameter(String name) {
return (parameters != null) ? (String) parameters.get(name) : null;
}
- public Enumeration getParameterNames() {
+ public Enumeration getParameterNames() {
return (parameters != null) ? new
IteratorWrapper(parameters.keySet().iterator()) : null;
}
- public String[] getParameterValues(String name) {
+ public String[] getParameterValues(String name) {
throw new RuntimeException (this.getClass().getName() +
".getParameterValues(String name) method not yet implemented!");
} // FIXME
- public String getHeader(String name) {
+ public String getHeader(String name) {
return (headers != null) ? (String) headers.get(name) : null;
}
public int getIntHeader(String name) {
String header = (headers != null) ? (String) headers.get(name) :
null;
return (header != null) ? Integer.parseInt(header) : -1;
}
- public long getDateHeader(String name) {
+ public long getDateHeader(String name) {
throw new RuntimeException (this.getClass().getName() +
".getDateHeader(String name) method not yet implemented!");
} // FIXME
- public Enumeration getHeaders(String name) {
+ public Enumeration getHeaders(String name) {
throw new RuntimeException (this.getClass().getName() +
".getHeaders(String name) method not yet implemented!");
} // FIXME
public Enumeration getHeaderNames() {
No revision
No revision
1.1.2.7 +2 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/XSLTFactoryLoader.java
Index: XSLTFactoryLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/XSLTFactoryLoader.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- XSLTFactoryLoader.java 2000/12/08 20:40:33 1.1.2.6
+++ XSLTFactoryLoader.java 2000/12/11 15:06:07 1.1.2.7
@@ -25,13 +25,13 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/12/08 20:40:33 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/11 15:06:07 $
*/
public class XSLTFactoryLoader {
protected Logger log = LogKit.getLoggerFor("cocoon");
- HashMap obj = new HashMap();
+ private HashMap obj = new HashMap();
public String getClassSource(String className, String prefix, String
pattern, NodeIterator conf)
throws ClassNotFoundException, InstantiationException,
IllegalAccessException, Exception {
No revision
No revision
1.1.2.15 +3 -3
xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- SQLTransformer.java 2000/12/08 20:40:42 1.1.2.14
+++ SQLTransformer.java 2000/12/11 15:06:10 1.1.2.15
@@ -41,7 +41,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2000/12/08 20:40:42 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2000/12/11 15:06:10 $ $Author:
bloritsch $
*/
public class SQLTransformer extends AbstractTransformer {
@@ -275,7 +275,7 @@
level = Integer.parseInt( attributes.getValue(my_uri,
MAGIC_ANCESTOR_VALUE_LEVEL_ATTRIBUTE));
} catch (Exception e) {
- log.debug("SQLTransformer", e);
+ log.debug("SQLTransformer", e);
throwIllegalStateException("Ancestor value elements must
have a "+
MAGIC_ANCESTOR_VALUE_LEVEL_ATTRIBUTE + " attribute");
}
@@ -594,7 +594,7 @@
}
- class AncestorValue {
+ private class AncestorValue {
protected int level;
protected String name;
1.1.2.14 +2 -3
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- XIncludeTransformer.java 2000/12/08 20:40:43 1.1.2.13
+++ XIncludeTransformer.java 2000/12/11 15:06:10 1.1.2.14
@@ -48,7 +48,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2000/12/08 20:40:43 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2000/12/11 15:06:10 $ $Author:
bloritsch $
*/
public class XIncludeTransformer extends AbstractTransformer implements
Composer {
@@ -258,9 +258,8 @@
class XIncludeContentHandler implements ContentHandler, LexicalHandler {
- ContentHandler content_handler;
+ private ContentHandler content_handler;
LexicalHandler lexical_handler;
- boolean debug;
XIncludeContentHandler(ContentHandler content_handler,
LexicalHandler lexical_handler) {
this.content_handler = content_handler;
No revision
No revision
1.1.2.9 +2 -2 xml-cocoon/src/org/apache/cocoon/util/Attic/IOUtils.java
Index: IOUtils.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/IOUtils.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- IOUtils.java 2000/12/08 20:40:54 1.1.2.8
+++ IOUtils.java 2000/12/11 15:06:12 1.1.2.9
@@ -24,7 +24,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/12/08 20:40:54 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/12/11 15:06:12 $
*/
public class IOUtils {
@@ -195,7 +195,7 @@
public static String getFullFilename(File file) {
try {
return file.getCanonicalPath();
- } catch (IOException e) {
+ } catch (Exception e) {
LogKit.getLoggerFor("cocoon").debug("IOUtils.getFullFilename", e);
return file.getAbsolutePath();
}
