You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by je...@apache.org on 2003/07/27 19:13:16 UTC
cvs commit: jakarta-commons-sandbox/io/src/java/org/apache/commons/io/input ClassLoaderObjectInputStream.java
jeremias 2003/07/27 10:13:16
Modified: io/src/java/org/apache/commons/io/input
ClassLoaderObjectInputStream.java
Log:
Correct license
Javadocs
Revision Changes Path
1.2 +23 -16 jakarta-commons-sandbox/io/src/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java
Index: ClassLoaderObjectInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/io/src/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassLoaderObjectInputStream.java 11 Nov 2002 19:34:02 -0000 1.1
+++ ClassLoaderObjectInputStream.java 27 Jul 2003 17:13:16 -0000 1.2
@@ -1,9 +1,7 @@
-package org.apache.commons.io.input;
-
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -18,21 +16,21 @@
* the documentation and/or other materials provided with the
* distribution.
*
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -53,6 +51,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+package org.apache.commons.io.input;
import java.io.IOException;
import java.io.InputStream;
@@ -72,6 +71,13 @@
{
private ClassLoader m_classLoader;
+ /**
+ * Constructs a new ClassLoaderObjectInputStream.
+ * @param classLoader ClassLoader from which classes should be loaded.
+ * @param inputStream InputStream to work on
+ * @throws IOException in case of an I/O error
+ * @throws StreamCorruptedException if the stream is corrupted
+ */
public ClassLoaderObjectInputStream( final ClassLoader classLoader,
final InputStream inputStream )
throws IOException, StreamCorruptedException
@@ -80,6 +86,7 @@
m_classLoader = classLoader;
}
+ /** @see java.io.ObjectInputStream#resolveClass(java.io.ObjectStreamClass) */
protected Class resolveClass( final ObjectStreamClass objectStreamClass )
throws IOException, ClassNotFoundException
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org