harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r820586 - in /harmony/enhanced/classlib/trunk/modules: archive/src/main/java/java/util/zip/Deflater.java luni/src/main/native/luni/windows/OSResourcesMonitorWin32.c luni/src/main/native/luni/windows/makefile
Date Thu, 01 Oct 2009 09:31:52 GMT
Author: tellison
Date: Thu Oct  1 09:31:46 2009
New Revision: 820586

URL: http://svn.apache.org/viewvc?rev=820586&view=rev
Log:
Remove more references to OSResourcesManager (part of r820583)

Removed:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/OSResourcesMonitorWin32.c
Modified:
    harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/Deflater.java
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/Deflater.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/Deflater.java?rev=820586&r1=820585&r2=820586&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/Deflater.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/Deflater.java
Thu Oct  1 09:31:46 2009
@@ -17,7 +17,6 @@
 
 package java.util.zip;
 
-import org.apache.harmony.luni.platform.OSResourcesMonitor;
 
 /**
  * This class compresses data using the <i>DEFLATE</i> algorithm (see <a
@@ -147,8 +146,7 @@
             throw new IllegalArgumentException();
         }
         compressLevel = level;
-        streamHandle = createStreamWithMemoryEnsurance(compressLevel, strategy,
-                noHeader);
+        streamHandle = createStream(compressLevel, strategy, noHeader);
     }
 
     /**
@@ -493,11 +491,5 @@
         return getTotalOutImpl(streamHandle);
     }
 
-    private long createStreamWithMemoryEnsurance(int level, int strategy1,
-            boolean noHeader1) {
-        OSResourcesMonitor.ensurePhysicalMemoryCapacity();
-        return createStream(level, strategy1, noHeader1);
-    }
-
     private native long createStream(int level, int strategy1, boolean noHeader1);
 }

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile?rev=820586&r1=820585&r2=820586&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile Thu
Oct  1 09:31:46 2009
@@ -36,8 +36,7 @@
   $(SHAREDSUB)filedesc.obj $(SHAREDSUB)timezone.obj \
   OSFileSystemWin32.obj hyenv.obj\
   $(SHAREDSUB)OSFileSystem.obj OSMemoryWin32.obj $(SHAREDSUB)OSMemory.obj \
-  $(SHAREDSUB)OSNetworkSystem.obj OSNetworkSystemWin32.obj \
-  OSResourcesMonitorWin32.obj
+  $(SHAREDSUB)OSNetworkSystem.obj OSNetworkSystemWin32.obj
 
 VIRTFILES = hyluni.res
 



Mime
View raw message