Reverted code that was breaking Windows file deletion

sigma_lmtd · sigma_lmtd · commit 3acf4bfd34e0 · 2007-01-22T22:02:30.000Z
git-svn-id: file:///tmp/test-svn/trunk@4080 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/util/classloader/StickyClassLoader.java b/drjava/src/edu/rice/cs/util/classloader/StickyClassLoader.java
@@ -38,6 +38,7 @@
 import java.io.IOException;
 
 import edu.rice.cs.plt.io.IOUtil;
+import edu.rice.cs.util.FileOps;
 
 /** A {@link ClassLoader} that works as the union of two classloaders, but always tries to delegate to the first of 
  *  these.  The purpose for this class is to ensure that classes loaded transitively due to some class's loading are
@@ -174,7 +175,7 @@ protected Class _loadWithSecondary(String name) throws ClassNotFoundException {
         throw new ClassNotFoundException("Resource not found: " + fileName);
       }
       
-      byte[] data = IOUtil.toByteArray(resource.openStream());
+      byte[] data = FileOps.readStreamAsBytes(resource.openStream());
       try {
         return defineClass(name, data, 0, data.length);
       }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`import java.io.IOException;`
`39`	`39`
`40`	`40`	`import edu.rice.cs.plt.io.IOUtil;`
	`41`	`+import edu.rice.cs.util.FileOps;`
`41`	`42`
`42`	`43`	`/** A {@link ClassLoader} that works as the union of two classloaders, but always tries to delegate to the first of`
`43`	`44`	`* these. The purpose for this class is to ensure that classes loaded transitively due to some class's loading are`
`@@ -174,7 +175,7 @@ protected Class _loadWithSecondary(String name) throws ClassNotFoundException {`
`174`	`175`	`throw new ClassNotFoundException("Resource not found: " + fileName);`
`175`	`176`	`}`
`176`	`177`
`177`		`- byte[] data = IOUtil.toByteArray(resource.openStream());`
	`178`	`+ byte[] data = FileOps.readStreamAsBytes(resource.openStream());`
`178`	`179`	`try {`
`179`	`180`	`return defineClass(name, data, 0, data.length);`
`180`	`181`	`}`