MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

JVM crash fix!!! (no more static fields)

Browse Source
This commit is contained in:
Dmitry Avdeev
2009-10-26 17:56:52 +03:00
parent 357a6a7e10
commit 27238601ed
2 changed files with 12 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32Kernel.java
+11 -47
View File
@@ -34,24 +34,17 @@ import java.util.Map;
*/
public class Win32Kernel {
private static Kernel32 ourKernel;
private static final int MAX_PATH = 0x00000104;
public static final int FILE_ATTRIBUTE_DIRECTORY = 0x00000010;
public static final int FILE_ATTRIBUTE_READONLY = 0x0001;
private synchronized static Kernel32 getKernel() {
if (ourKernel == null) {
ourKernel = (Kernel32)Native.loadLibrary("kernel32", Kernel32.class, new HashMap<Object, Object>() {
private Kernel32 myKernel = (Kernel32)Native.loadLibrary("kernel32", Kernel32.class, new HashMap<Object, Object>() {
{
put(Library.OPTION_TYPE_MAPPER, W32APITypeMapper.UNICODE);
put(Library.OPTION_FUNCTION_MAPPER, W32APIFunctionMapper.UNICODE);
}});
WIN32_FIND_DATA.INSTANCE = new WIN32_FIND_DATA();
BY_HANDLE_FILE_INFORMATION.INSTANCE = new BY_HANDLE_FILE_INFORMATION();
}
return ourKernel;
}
WIN32_FIND_DATA myData = new WIN32_FIND_DATA();
private static class FileInfo {
private FileInfo(WIN32_FIND_DATA data) {
@@ -59,24 +52,12 @@ public class Win32Kernel {
this.ftLastWriteTime = data.ftLastWriteTime.toLong();
}
private FileInfo(BY_HANDLE_FILE_INFORMATION information) {
this.dwFileAttributes = information.dwFileAttributes;
this.ftLastWriteTime = information.ftLastWriteTime.toLong();
}
int dwFileAttributes;
long ftLastWriteTime;
}
private static W32API.HANDLE INVALID_HANDLE_VALUE = new W32API.HANDLE(Pointer.createConstant(0xFFFFFFFFl));
public static void release() {
if (ourKernel != null) {
WIN32_FIND_DATA.INSTANCE = null;
BY_HANDLE_FILE_INFORMATION.INSTANCE = null;
}
}
private Map<String, FileInfo> myCache = new HashMap<String, FileInfo>();
public String[] list(String absolutePath) {
@@ -84,22 +65,22 @@ public class Win32Kernel {
myCache.clear();
ArrayList<String> list = new ArrayList<String>();
W32API.HANDLE hFind = getKernel().FindFirstFile(absolutePath.replace('/', '\\') + "\\*", WIN32_FIND_DATA.INSTANCE);
W32API.HANDLE hFind = myKernel.FindFirstFile(absolutePath.replace('/', '\\') + "\\*", myData);
if (hFind.equals(INVALID_HANDLE_VALUE)) return new String[0];
do {
String name = Native.toString(WIN32_FIND_DATA.INSTANCE.cFileName);
String name = Native.toString(myData.cFileName);
if (name.equals(".")) {
myCache.put(absolutePath, new FileInfo(WIN32_FIND_DATA.INSTANCE));
myCache.put(absolutePath, new FileInfo(myData));
continue;
}
else if (name.equals("..")) {
continue;
}
myCache.put(absolutePath + "/" + name, new FileInfo(WIN32_FIND_DATA.INSTANCE));
myCache.put(absolutePath + "/" + name, new FileInfo(myData));
list.add(name);
}
while (getKernel().FindNextFile(hFind, WIN32_FIND_DATA.INSTANCE));
getKernel().FindClose(hFind);
while (myKernel.FindNextFile(hFind, myData));
myKernel.FindClose(hFind);
return list.toArray(new String[list.size()]);
}
@@ -131,10 +112,10 @@ public class Win32Kernel {
FileInfo data = myCache.get(path);
if (data == null) {
myCache.clear();
if (!getKernel().GetFileAttributesEx(path.replace('/', '\\'), 0, BY_HANDLE_FILE_INFORMATION.INSTANCE)) {
if (myKernel.FindFirstFile(path.replace('/', '\\'), myData).equals(INVALID_HANDLE_VALUE)) {
throw new FileNotFoundException(path);
}
data = new FileInfo(BY_HANDLE_FILE_INFORMATION.INSTANCE);
data = new FileInfo(myData);
myCache.put(path, data);
}
return data;
@@ -144,8 +125,6 @@ public class Win32Kernel {
W32API.HANDLE FindFirstFile(String lpFileName, WIN32_FIND_DATA lpFindFileData);
boolean GetFileAttributesEx(String lpFileName, int level, BY_HANDLE_FILE_INFORMATION lpFileInformation);
boolean FindNextFile(W32API.HANDLE hFindFile, WIN32_FIND_DATA lpFindFileData);
boolean FindClose(W32API.HANDLE hFindFile);
@@ -173,8 +152,6 @@ public class Win32Kernel {
@SuppressWarnings({"UnusedDeclaration"})
public static class WIN32_FIND_DATA extends Structure {
public static WIN32_FIND_DATA INSTANCE;
public int dwFileAttributes;
public FILETIME ftCreationTime;
@@ -195,17 +172,4 @@ public class Win32Kernel {
public char[] cAlternateFileName = new char[14];
}
@SuppressWarnings({"UnusedDeclaration"})
public static class BY_HANDLE_FILE_INFORMATION extends Structure {
public static BY_HANDLE_FILE_INFORMATION INSTANCE;
public int dwFileAttributes;
public FILETIME ftCreationTime;
public FILETIME ftLastAccessTime;
public FILETIME ftLastWriteTime;
public int nFileSizeHigh;
public int nFileSizeLow;
}
}
platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java
+1 -3
View File
@@ -38,9 +38,7 @@ public class Win32LocalFileSystem extends LocalFileSystemBase {
}
public static void release() {
if (ourSystem != null) {
Win32Kernel.release();
}
ourSystem = null;
}
private final Win32Kernel myKernel = new Win32Kernel();