1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Tim Bell 2009-08-14 08:51:56 -07:00
commit 30d9505bc1
9 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -42,3 +42,4 @@ d22867c5f1b295a0a2b3b4bc8999a2676f6e20c3 jdk7-b64
7d3bf00f3cc4f8125de1842521e7567f37dc84b8 jdk7-b65 7d3bf00f3cc4f8125de1842521e7567f37dc84b8 jdk7-b65
62109d1b9e7310f29ab51ca6f1d71b899c0ce6b0 jdk7-b66 62109d1b9e7310f29ab51ca6f1d71b899c0ce6b0 jdk7-b66
eb24af1404aec8aa140c4cd4d13d2839b150dd41 jdk7-b67 eb24af1404aec8aa140c4cd4d13d2839b150dd41 jdk7-b67
bca2225b66d78c4bf4d9801f54cac7715a598650 jdk7-b68

1
.hgtags-top-repo
View File

@ -42,3 +42,4 @@ c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65 e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67 c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68

1
corba/.hgtags
View File

@ -42,3 +42,4 @@ d20e45cd539f20405ff843652069cfd7550c5ab3 jdk7-b63
97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65 97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65
a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66 a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66
a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67 a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67
5182bcc9c60cac429d1f7988676cec7320752be3 jdk7-b68

1
hotspot/.hgtags
View File

@ -42,3 +42,4 @@ ba36394eb84b949b31212bdb32a518a8f92bab5b jdk7-b64
ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65 ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65
57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66 57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66
18f526145aea355a9320b724373386fc2170f183 jdk7-b67 18f526145aea355a9320b724373386fc2170f183 jdk7-b67
d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68

1
jaxp/.hgtags
View File

@ -42,3 +42,4 @@ a10eec7a1edf536f39b5828d8623054dbc62c2b7 jdk7-b64
008c662e0ee9a91aebb75e46b97de979083d5c1c jdk7-b65 008c662e0ee9a91aebb75e46b97de979083d5c1c jdk7-b65
22f9d5d5b5fe0f47048f41e6c6e54fee5edad0ec jdk7-b66 22f9d5d5b5fe0f47048f41e6c6e54fee5edad0ec jdk7-b66
a033af8d824a408d3ac602205ecdefc128749e1e jdk7-b67 a033af8d824a408d3ac602205ecdefc128749e1e jdk7-b67
83b2a9331383f9db7a49350d4cb13b7635f6b861 jdk7-b68

1
jaxws/.hgtags
View File

@ -42,3 +42,4 @@ aaa25dfd3de68c6f1a1d3ef8c45fd99f76bca6dd jdk7-b64
aa22a1be5866a6608ba17a7a443945559409ae0f jdk7-b65 aa22a1be5866a6608ba17a7a443945559409ae0f jdk7-b65
fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66 fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66
faa13cd4d6cdcfb155da5ed23b0da6e0ed0f9ea8 jdk7-b67 faa13cd4d6cdcfb155da5ed23b0da6e0ed0f9ea8 jdk7-b67
845fa487f0f72a9f232ead8315c0087a477a5a31 jdk7-b68

1
jdk/.hgtags
View File

@ -43,3 +43,4 @@ a50217eb3ee10b9f9547e0708e5c9625405083ef jdk7-b64
bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66 bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66
a952aafd5181af953b0ef3010dbd2fcc28460e8a jdk7-b67 a952aafd5181af953b0ef3010dbd2fcc28460e8a jdk7-b67
b23d905cb5d3b382295240d28ab0bfb266b4503c jdk7-b68 b23d905cb5d3b382295240d28ab0bfb266b4503c jdk7-b68
226b20019b1f020c09ea97d137d98e011ce65d76 jdk7-b69

6
jdk/src/windows/native/sun/jkernel/kernel.cpp
View File

@ -116,11 +116,11 @@ char* getStringPlatformChars(JNIEnv* env, jstring jstr) {
char *result = NULL; char *result = NULL;
size_t len; size_t len;
const jchar* utf16 = env->GetStringChars(jstr, NULL); const jchar* utf16 = env->GetStringChars(jstr, NULL);
len = wcstombs(NULL, utf16, env->GetStringLength(jstr) * 4) + 1; len = wcstombs(NULL, (const wchar_t*)utf16, env->GetStringLength(jstr) * 4) + 1;
if (len == -1) if (len == -1)
return NULL; return NULL;
result = (char*) malloc(len); result = (char*) malloc(len);
if (wcstombs(result, utf16, len) == -1) if (wcstombs(result, (const wchar_t*)utf16, len) == -1)
return NULL; return NULL;
env->ReleaseStringChars(jstr, utf16); env->ReleaseStringChars(jstr, utf16);
return result; return result;
@ -640,7 +640,7 @@ JNIEXPORT void JNICALL Java_sun_jkernel_DownloadManager_startBackgroundDownloadW
} }
void getParent(const TCHAR *path, TCHAR *dest) { void getParent(TCHAR *path, TCHAR *dest) {
char* lastSlash = max(strrchr(path, '\\'), strrchr(path, '/')); char* lastSlash = max(strrchr(path, '\\'), strrchr(path, '/'));
if (lastSlash == NULL) { if (lastSlash == NULL) {
*dest = NULL; *dest = NULL;

1
langtools/.hgtags
View File

@ -42,3 +42,4 @@ d8f23a81d46f47a4186f1044dd9e44841bbeab84 jdk7-b64
7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65 7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65
634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66 634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66
14b1a8ede95493fc53c37ff2626f1f98ce94d108 jdk7-b67 14b1a8ede95493fc53c37ff2626f1f98ce94d108 jdk7-b67
95c1212b07e33b1b8c689b1d279d82ffd5a56e43 jdk7-b68