Author: arp
Date: Sat Aug 23 07:49:41 2014
New Revision: 1619980
URL: http://svn.apache.org/r1619980
Log:
Merging r1619458 through r1619979 from trunk to branch HDFS-6581
Added:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java
- copied unchanged from r1619979,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueueMXBean.java
- copied unchanged from r1619979,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueueMXBean.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcMultiplexer.java
- copied unchanged from r1619979,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcMultiplexer.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ApplicationClassLoader.java
- copied unchanged from r1619979,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ApplicationClassLoader.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestFairCallQueue.java
- copied unchanged from r1619979,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestFairCallQueue.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/ClassLoaderCheck.java
- copied unchanged from r1619979,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/ClassLoaderCheck.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/ClassLoaderCheckMain.java
- copied unchanged from r1619979,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/ClassLoaderCheckMain.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/ClassLoaderCheckSecond.java
- copied unchanged from r1619979,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/ClassLoaderCheckSecond.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/ClassLoaderCheckThird.java
- copied unchanged from r1619979,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/ClassLoaderCheckThird.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestApplicationClassLoader.java
- copied unchanged from r1619979,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestApplicationClassLoader.java
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WeightedRoundRobinMultiplexer.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/hadoop_user_info.c
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/CHANGES.txt
Sat Aug 23 07:49:41 2014
@@ -13,8 +13,6 @@ Trunk (Unreleased)
NEW FEATURES
- HADOOP-10433. Key Management Server based on KeyProvider API. (tucu)
-
HADOOP-9629. Support Windows Azure Storage - Blob as a file system in
Hadoop.
(Dexter Bradshaw, Mostafa Elhemali, Xi Fang, Johannes Klein, David Lao,
Mike Liddell, Chuan Liu, Lengning Liu, Ivan Mitic, Michael Rys,
@@ -25,9 +23,6 @@ Trunk (Unreleased)
Mike Liddell, Chuan Liu, Lengning Liu, Ivan Mitic, Michael Rys,
Alexander Stojanovich, Brian Swan, and Min Wei via cnauroth)
- HADOOP-10719. Add generateEncryptedKey and decryptEncryptedKey
- methods to KeyProvider. (asuresh via tucu)
-
IMPROVEMENTS
HADOOP-8017. Configure hadoop-main pom to get rid of M2E plugin execution
@@ -121,93 +116,15 @@ Trunk (Unreleased)
HADOOP-9833 move slf4j to version 1.7.5 (Kousuke Saruta via stevel)
- HADOOP-10141. Create KeyProvider API to separate encryption key storage
- from the applications. (omalley)
-
- HADOOP-10201. Add listing to KeyProvider API. (Larry McCay via omalley)
-
- HADOOP-10177. Create CLI tools for managing keys. (Larry McCay via omalley)
-
- HADOOP-10244. TestKeyShell improperly tests the results of delete (Larry
- McCay via omalley)
-
HADOOP-10325. Improve jenkins javadoc warnings from test-patch.sh (cmccabe)
HADOOP-10342. Add a new method to UGI to use a Kerberos login subject to
build a new UGI. (Larry McCay via omalley)
- HADOOP-10237. JavaKeyStoreProvider needs to set keystore permissions
- correctly. (Larry McCay via omalley)
-
- HADOOP-10432. Refactor SSLFactory to expose static method to determine
- HostnameVerifier. (tucu)
-
- HADOOP-10427. KeyProvider implementations should be thread safe. (tucu)
-
- HADOOP-10429. KeyStores should have methods to generate the materials
- themselves, KeyShell should use them. (tucu)
-
- HADOOP-10428. JavaKeyStoreProvider should accept keystore password via
- configuration falling back to ENV VAR. (tucu)
-
- HADOOP-10430. KeyProvider Metadata should have an optional description,
- there should be a method to retrieve the metadata from all keys. (tucu)
-
- HADOOP-10534. KeyProvider getKeysMetadata should take a list of names
- rather than returning all keys. (omalley)
-
HADOOP-10563. Remove the dependency of jsp in trunk. (wheat9)
HADOOP-10485. Remove dead classes in hadoop-streaming. (wheat9)
- HADOOP-10696. Add optional attributes to KeyProvider Options and Metadata.
- (tucu)
-
- HADOOP-10695. KMSClientProvider should respect a configurable timeout.
- (yoderme via tucu)
-
- HADOOP-10757. KeyProvider KeyVersion should provide the key name.
- (asuresh via tucu)
-
- HADOOP-10769. Create KeyProvider extension to handle delegation tokens.
- (Arun Suresh via atm)
-
- HADOOP-10812. Delegate KeyProviderExtension#toString to underlying
- KeyProvider. (wang)
-
- HADOOP-10736. Add key attributes to the key shell. (Mike Yoder via wang)
-
- HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via
umamahesh)
-
- HADOOP-10841. EncryptedKeyVersion should have a key name property.
- (asuresh via tucu)
-
- HADOOP-10842. CryptoExtension generateEncryptedKey method should
- receive the key name. (asuresh via tucu)
-
- HADOOP-10750. KMSKeyProviderCache should be in hadoop-common.
- (asuresh via tucu)
-
- HADOOP-10720. KMS: Implement generateEncryptedKey and decryptEncryptedKey
- in the REST API. (asuresh via tucu)
-
- HADOOP-10891. Add EncryptedKeyVersion factory method to
- KeyProviderCryptoExtension. (wang)
-
- HADOOP-10756. KMS audit log should consolidate successful similar
requests.
- (asuresh via tucu)
-
- HADOOP-10793. KeyShell args should use single-dash style. (wang)
-
- HADOOP-10936. Change default KeyProvider bitlength to 128. (wang)
-
- HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting
- underlying store. (asuresh via tucu)
-
- HADOOP-10770. KMS add delegation token support. (tucu)
-
- HADOOP-10698. KMS, add proxyuser support. (tucu)
-
BUG FIXES
HADOOP-9451. Fault single-layer config if node group topology is enabled.
@@ -379,22 +296,9 @@ Trunk (Unreleased)
HADOOP-10044 Improve the javadoc of rpc code (sanjay Radia)
- HADOOP-10488. TestKeyProviderFactory fails randomly. (tucu)
-
- HADOOP-10431. Change visibility of KeyStore.Options getter methods to
public. (tucu)
-
- HADOOP-10583. bin/hadoop key throws NPE with no args and assorted other
fixups. (clamb via tucu)
-
- HADOOP-10586. KeyShell doesn't allow setting Options via CLI. (clamb via
tucu)
-
HADOOP-10625. Trim configuration names when putting/getting them
to properties. (Wangda Tan via xgong)
- HADOOP-10645. TestKMS fails because race condition writing acl files.
(tucu)
-
- HADOOP-10611. KMS, keyVersion name should not be assumed to be
- keyName@versionNumber. (tucu)
-
HADOOP-10717. HttpServer2 should load jsp DTD from local jars instead of
going remote. (Dapeng Sun via wheat9)
@@ -409,33 +313,12 @@ Trunk (Unreleased)
HADOOP-10834. Typo in CredentialShell usage. (Benoy Antony via umamahesh)
- HADOOP-10816. KeyShell returns -1 on error to the shell, should be 1.
- (Mike Yoder via wang)
-
HADOOP-10840. Fix OutOfMemoryError caused by metrics system in Azure File
System. (Shanyu Zhao via cnauroth)
- HADOOP-10826. Iteration on KeyProviderFactory.serviceLoader is
- thread-unsafe. (benoyantony viat tucu)
-
- HADOOP-10881. Clarify usage of encryption and encrypted encryption
- key in KeyProviderCryptoExtension. (wang)
-
- HADOOP-10920. site plugin couldn't parse hadoop-kms index.apt.vm.
- (Akira Ajisaka via wang)
-
HADOOP-10925. Compilation fails in native link0 function on Windows.
(cnauroth)
- HADOOP-10939. Fix TestKeyProviderFactory testcases to use default 128 bit
- length keys. (Arun Suresh via wang)
-
- HADOOP-10862. Miscellaneous trivial corrections to KMS classes.
- (asuresh via tucu)
-
- HADOOP-10967. Improve DefaultCryptoExtension#generateEncryptedKey
- performance. (hitliuyi via tucu)
-
OPTIMIZATIONS
HADOOP-7761. Improve the performance of raw comparisons. (todd)
@@ -498,6 +381,11 @@ Release 2.6.0 - UNRELEASED
NEW FEATURES
+ HADOOP-10433. Key Management Server based on KeyProvider API. (tucu)
+
+ HADOOP-10893. isolated classloader on the client side (Sangjin Lee via
+ jlowe)
+
IMPROVEMENTS
HADOOP-10808. Remove unused native code for munlock. (cnauroth)
@@ -582,10 +470,100 @@ Release 2.6.0 - UNRELEASED
HADOOP-10975. org.apache.hadoop.util.DataChecksum should support
calculating
checksums in native code (James Thomas via Colin Patrick McCabe)
+ HADOOP-10201. Add listing to KeyProvider API. (Larry McCay via omalley)
+
+ HADOOP-10177. Create CLI tools for managing keys. (Larry McCay via omalley)
+
+ HADOOP-10432. Refactor SSLFactory to expose static method to determine
+ HostnameVerifier. (tucu)
+
+ HADOOP-10429. KeyStores should have methods to generate the materials
+ themselves, KeyShell should use them. (tucu)
+
+ HADOOP-10427. KeyProvider implementations should be thread safe. (tucu)
+
+ HADOOP-10428. JavaKeyStoreProvider should accept keystore password via
+ configuration falling back to ENV VAR. (tucu)
+
+ HADOOP-10430. KeyProvider Metadata should have an optional description,
+ there should be a method to retrieve the metadata from all keys. (tucu)
+
+ HADOOP-10431. Change visibility of KeyStore.Options getter methods to
+ public. (tucu)
+
+ HADOOP-10534. KeyProvider getKeysMetadata should take a list of names
+ rather than returning all keys. (omalley)
+
+ HADOOP-10719. Add generateEncryptedKey and decryptEncryptedKey
+ methods to KeyProvider. (asuresh via tucu)
+
+ HADOOP-10817. ProxyUsers configuration should support configurable
+ prefixes. (tucu)
+
+ HADOOP-10881. Clarify usage of encryption and encrypted encryption
+ key in KeyProviderCryptoExtension. (wang)
+
+ HADOOP-10770. KMS add delegation token support. (tucu)
+
+ HADOOP-10698. KMS, add proxyuser support. (tucu)
+
+ HADOOP-8896. Javadoc points to Wrong Reader and Writer classes
+ in SequenceFile (Ray Chiang via aw)
+
+ HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw)
+
OPTIMIZATIONS
HADOOP-10838. Byte array native checksumming. (James Thomas via todd)
+ HADOOP-10696. Add optional attributes to KeyProvider Options and Metadata.
+ (tucu)
+
+ HADOOP-10695. KMSClientProvider should respect a configurable timeout.
+ (yoderme via tucu)
+
+ HADOOP-10757. KeyProvider KeyVersion should provide the key name.
+ (asuresh via tucu)
+
+ HADOOP-10769. Create KeyProvider extension to handle delegation tokens.
+ (Arun Suresh via atm)
+
+ HADOOP-10812. Delegate KeyProviderExtension#toString to underlying
+ KeyProvider. (wang)
+
+ HADOOP-10736. Add key attributes to the key shell. (Mike Yoder via wang)
+
+ HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via
umamahesh)
+
+ HADOOP-10841. EncryptedKeyVersion should have a key name property.
+ (asuresh via tucu)
+
+ HADOOP-10842. CryptoExtension generateEncryptedKey method should
+ receive the key name. (asuresh via tucu)
+
+ HADOOP-10750. KMSKeyProviderCache should be in hadoop-common.
+ (asuresh via tucu)
+
+ HADOOP-10720. KMS: Implement generateEncryptedKey and decryptEncryptedKey
+ in the REST API. (asuresh via tucu)
+
+ HADOOP-10891. Add EncryptedKeyVersion factory method to
+ KeyProviderCryptoExtension. (wang)
+
+ HADOOP-10756. KMS audit log should consolidate successful similar requests.
+ (asuresh via tucu)
+
+ HADOOP-10793. KeyShell args should use single-dash style. (wang)
+
+ HADOOP-10936. Change default KeyProvider bitlength to 128. (wang)
+
+ HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting
+ underlying store. (asuresh via tucu)
+
+ HADOOP-10282. Create a FairCallQueue: a multi-level call queue which
+ schedules incoming calls and multiplexes outgoing calls. (Chris Li via
+ Arpit Agarwal)
+
BUG FIXES
HADOOP-10781. Unportable getgrouplist() usage breaks FreeBSD (Dmitry
@@ -621,11 +599,6 @@ Release 2.6.0 - UNRELEASED
HADOOP-10927. Fix CredentialShell help behavior and error codes.
(Josh Elser via wang)
- HADOOP-10937. Need to set version name correctly before decrypting EEK.
- (Arun Suresh via wang)
-
- HADOOP-10918. JMXJsonServlet fails when used within Tomcat. (tucu)
-
HADOOP-10933. FileBasedKeyStoresFactory Should use
Configuration.getPassword
for SSL Passwords. (lmccay via tucu)
@@ -676,6 +649,52 @@ Release 2.6.0 - UNRELEASED
HADOOP-10968. hadoop native build fails to detect java_libarch on
ppc64le (Dinar Valeev via Colin Patrick McCabe)
+ HADOOP-10141. Create KeyProvider API to separate encryption key storage
+ from the applications. (omalley)
+
+ HADOOP-10237. JavaKeyStoreProvider needs to set keystore permissions
+ correctly. (Larry McCay via omalley)
+
+ HADOOP-10244. TestKeyShell improperly tests the results of delete (Larry
+ McCay via omalley)
+
+ HADOOP-10583. bin/hadoop key throws NPE with no args and assorted other
fixups. (clamb via tucu)
+
+ HADOOP-10586. KeyShell doesn't allow setting Options via CLI. (clamb via
tucu)
+
+ HADOOP-10645. TestKMS fails because race condition writing acl files.
(tucu)
+
+ HADOOP-10611. KMS, keyVersion name should not be assumed to be
+ keyName@versionNumber. (tucu)
+
+ HADOOP-10816. KeyShell returns -1 on error to the shell, should be 1.
+ (Mike Yoder via wang)
+
+ HADOOP-10826. Iteration on KeyProviderFactory.serviceLoader is
+ thread-unsafe. (benoyantony viat tucu)
+
+ HADOOP-10920. site plugin couldn't parse hadoop-kms index.apt.vm.
+ (Akira Ajisaka via wang)
+
+ HADOOP-10937. Need to set version name correctly before decrypting EEK.
+ (Arun Suresh via wang)
+
+ HADOOP-10918. JMXJsonServlet fails when used within Tomcat. (tucu)
+
+ HADOOP-10939. Fix TestKeyProviderFactory testcases to use default 128 bit
+ length keys. (Arun Suresh via wang)
+
+ HADOOP-10862. Miscellaneous trivial corrections to KMS classes.
+ (asuresh via tucu)
+
+ HADOOP-10967. Improve DefaultCryptoExtension#generateEncryptedKey
+ performance. (hitliuyi via tucu)
+
+ HADOOP-10488. TestKeyProviderFactory fails randomly. (tucu)
+
+ HADOOP-10989. Work around buggy getgrouplist() implementations on Linux
that
+ return 0 on failure. (cnauroth)
+
Release 2.5.0 - 2014-08-11
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1619458-1619979
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
Sat Aug 23 07:49:41 2014
@@ -108,6 +108,11 @@
<Method name="driver" />
<Bug pattern="DM_EXIT" />
</Match>
+ <Match>
+ <Class name="org.apache.hadoop.util.RunJar" />
+ <Method name="run" />
+ <Bug pattern="DM_EXIT" />
+ </Match>
<!--
We need to cast objects between old and new api objects
-->
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh
Sat Aug 23 07:49:41 2014
@@ -26,7 +26,7 @@ _hadoop() {
COMPREPLY=()
cur=${COMP_WORDS[COMP_CWORD]}
prev=${COMP_WORDS[COMP_CWORD-1]}
- script=`which ${COMP_WORDS[0]}`
+ script=$(which ${COMP_WORDS[0]})
# Bash lets you tab complete things even if the script doesn't
# exist (or isn't executable). Check to make sure it is, as we
@@ -36,9 +36,9 @@ _hadoop() {
1)
# Completing the first argument (the command).
- temp=`$script | grep -n "^\s*or"`;
- temp=`$script | head -n $((${temp%%:*} - 1)) | awk '/^ / {print $1}' |
sort | uniq`;
- COMPREPLY=(`compgen -W "${temp}" -- ${cur}`);
+ temp=$($script | grep -n "^\s*or");
+ temp=$($script | head -n $((${temp%%:*} - 1)) | awk '/^ / {print $1}' |
sort | uniq);
+ COMPREPLY=($(compgen -W "${temp}" -- ${cur}));
return 0;;
2)
@@ -51,21 +51,21 @@ _hadoop() {
dfs | dfsadmin | fs | job | pipes)
# One option per line, enclosed in square brackets
- temp=`$script ${COMP_WORDS[1]} 2>&1 | awk '/^[ \t]*\[/ {gsub("[[\\]]",
""); print $1}'`;
- COMPREPLY=(`compgen -W "${temp}" -- ${cur}`);
+ temp=$($script ${COMP_WORDS[1]} 2>&1 | awk '/^[ \t]*\[/
{gsub("[[\\]]", ""); print $1}');
+ COMPREPLY=($(compgen -W "${temp}" -- ${cur}));
return 0;;
jar)
# Any (jar) file
- COMPREPLY=(`compgen -A file -- ${cur}`);
+ COMPREPLY=($(compgen -A file -- ${cur}));
return 0;;
namenode)
# All options specified in one line,
# enclosed in [] and separated with |
- temp=`$script ${COMP_WORDS[1]} -help 2>&1 | grep Usage: | cut -d '['
-f 2- | awk '{gsub("] \\| \\[|]", " "); print $0}'`;
- COMPREPLY=(`compgen -W "${temp}" -- ${cur}`);
+ temp=$($script ${COMP_WORDS[1]} -help 2>&1 | grep Usage: | cut -d '['
-f 2- | awk '{gsub("] \\| \\[|]", " "); print $0}');
+ COMPREPLY=($(compgen -W "${temp}" -- ${cur}));
return 0;;
*)
@@ -83,26 +83,24 @@ _hadoop() {
# Pull the list of options, grep for the one the user is trying to use,
# and then select the description of the relevant argument
temp=$((${COMP_CWORD} - 1));
- temp=`$script ${COMP_WORDS[1]} 2>&1 | grep -- "${COMP_WORDS[2]} " |
awk '{gsub("[[ \\]]", ""); print $0}' | cut -d '<' -f ${temp}`;
+ temp=$($script ${COMP_WORDS[1]} 2>&1 | grep -- "${COMP_WORDS[2]} " |
awk '{gsub("[[ \\]]", ""); print $0}' | cut -d '<' -f ${temp} | cut -d '>' -f
1);
if [ ${#temp} -lt 1 ]; then
# No match
return 1;
fi;
- temp=${temp:0:$((${#temp} - 1))};
-
# Now do completion based on the argument
case $temp in
path | src | dst)
# DFS path completion
- temp=`$script ${COMP_WORDS[1]} -ls "${cur}*" 2>&1 | grep -vE '^Found
' | cut -f 1 | awk '{gsub("^.* ", ""); print $0;}'`
- COMPREPLY=(`compgen -W "${temp}" -- ${cur}`);
+ temp=$($script ${COMP_WORDS[1]} -ls -d "${cur}*" 2>/dev/null | grep
-vE '^Found ' | cut -f 1 | awk '{gsub("^.* ", ""); print $0;}');
+ COMPREPLY=($(compgen -W "${temp}" -- ${cur}));
return 0;;
localsrc | localdst)
# Local path completion
- COMPREPLY=(`compgen -A file -- ${cur}`);
+ COMPREPLY=($(compgen -A file -- ${cur}));
return 0;;
*)
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
Sat Aug 23 07:49:41 2014
@@ -282,10 +282,12 @@ if not "%HADOOP_MAPRED_HOME%\%MAPRED_DIR
@rem
if defined HADOOP_CLASSPATH (
- if defined HADOOP_USER_CLASSPATH_FIRST (
- set CLASSPATH=%HADOOP_CLASSPATH%;%CLASSPATH%;
- ) else (
- set CLASSPATH=%CLASSPATH%;%HADOOP_CLASSPATH%;
+ if not defined HADOOP_USE_CLIENT_CLASSLOADER (
+ if defined HADOOP_USER_CLASSPATH_FIRST (
+ set CLASSPATH=%HADOOP_CLASSPATH%;%CLASSPATH%;
+ ) else (
+ set CLASSPATH=%CLASSPATH%;%HADOOP_CLASSPATH%;
+ )
)
)
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
Sat Aug 23 07:49:41 2014
@@ -450,7 +450,8 @@ function hadoop_add_to_classpath_mapred
function hadoop_add_to_classpath_userpath
{
# Add the user-specified HADOOP_CLASSPATH to the
- # official CLASSPATH env var.
+ # official CLASSPATH env var if HADOOP_USE_CLIENT_CLASSLOADER
+ # is not set.
# Add it first or last depending on if user has
# set env-var HADOOP_USER_CLASSPATH_FIRST
# we'll also dedupe it, because we're cool like that.
@@ -469,14 +470,16 @@ function hadoop_add_to_classpath_userpat
done
let j=c-1
- if [[ -z "${HADOOP_USER_CLASSPATH_FIRST}" ]]; then
- for ((i=j; i>=0; i--)); do
- hadoop_add_classpath "${array[$i]}" before
- done
- else
- for ((i=0; i<=j; i++)); do
- hadoop_add_classpath "${array[$i]}" after
- done
+ if [[ -z "${HADOOP_USE_CLIENT_CLASSLOADER}" ]]; then
+ if [[ -z "${HADOOP_USER_CLASSPATH_FIRST}" ]]; then
+ for ((i=j; i>=0; i--)); do
+ hadoop_add_classpath "${array[$i]}" before
+ done
+ else
+ for ((i=0; i<=j; i++)); do
+ hadoop_add_classpath "${array[$i]}" after
+ done
+ fi
fi
fi
}
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd
Sat Aug 23 07:49:41 2014
@@ -29,6 +29,26 @@
@rem by doing
@rem export HADOOP_USER_CLASSPATH_FIRST=true
@rem
+@rem HADOOP_USE_CLIENT_CLASSLOADER When defined, HADOOP_CLASSPATH and the
+@rem jar as the hadoop jar argument are
+@rem handled by a separate isolated client
+@rem classloader. If it is set,
+@rem HADOOP_USER_CLASSPATH_FIRST is
+@rem ignored. Can be defined by doing
+@rem export
HADOOP_USE_CLIENT_CLASSLOADER=true
+@rem
+@rem HADOOP_CLIENT_CLASSLOADER_SYSTEM_CLASSES
+@rem When defined, it overrides the default
+@rem definition of system classes for the
+@rem client classloader when
+@rem HADOOP_USE_CLIENT_CLASSLOADER is
+@rem enabled. Names ending in '.' (period)
+@rem are treated as package names, and names
+@rem starting with a '-' are treated as
+@rem negative matches. For example,
+@rem export
HADOOP_CLIENT_CLASSLOADER_SYSTEM_CLASSES="-org.apache.hadoop.UserClass,java.,javax.,org.apache.hadoop."
+
+@rem
@rem HADOOP_HEAPSIZE The maximum amount of heap to use, in MB.
@rem Default is 1000.
@rem
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
Sat Aug 23 07:49:41 2014
@@ -111,6 +111,17 @@ esac
# Should HADOOP_USER_CLASSPATH be first in the official CLASSPATH?
# export HADOOP_USER_CLASSPATH_FIRST="yes"
+# If HADOOP_USE_CLIENT_CLASSLOADER is set, HADOOP_CLASSPATH along with the main
+# jar are handled by a separate isolated client classloader. If it is set,
+# HADOOP_USER_CLASSPATH_FIRST is ignored. Can be defined by doing
+# export HADOOP_USE_CLIENT_CLASSLOADER=true
+
+# HADOOP_CLIENT_CLASSLOADER_SYSTEM_CLASSES overrides the default definition of
+# system classes for the client classloader when HADOOP_USE_CLIENT_CLASSLOADER
+# is enabled. Names ending in '.' (period) are treated as package names, and
+# names starting with a '-' are treated as negative matches. For example,
+# export
HADOOP_CLIENT_CLASSLOADER_SYSTEM_CLASSES="-org.apache.hadoop.UserClass,java.,javax.,org.apache.hadoop."
+
###
# Options for remote shell connectivity
###
Propchange:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1619458-1619979
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
Sat Aug 23 07:49:41 2014
@@ -53,8 +53,9 @@ import org.apache.hadoop.util.Time;
* <code>SequenceFile</code>s are flat files consisting of binary key/value
* pairs.
*
- * <p><code>SequenceFile</code> provides {@link Writer}, {@link Reader} and
- * {@link Sorter} classes for writing, reading and sorting respectively.</p>
+ * <p><code>SequenceFile</code> provides {@link SequenceFile.Writer},
+ * {@link SequenceFile.Reader} and {@link Sorter} classes for writing,
+ * reading and sorting respectively.</p>
*
* There are three <code>SequenceFile</code> <code>Writer</code>s based on the
* {@link CompressionType} used to compress key/value pairs:
@@ -79,8 +80,8 @@ import org.apache.hadoop.util.Time;
* <p>The recommended way is to use the static <tt>createWriter</tt> methods
* provided by the <code>SequenceFile</code> to chose the preferred format.</p>
*
- * <p>The {@link Reader} acts as the bridge and can read any of the above
- * <code>SequenceFile</code> formats.</p>
+ * <p>The {@link SequenceFile.Reader} acts as the bridge and can read any of
the
+ * above <code>SequenceFile</code> formats.</p>
*
* <h4 id="Formats">SequenceFile Formats</h4>
*
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WeightedRoundRobinMultiplexer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WeightedRoundRobinMultiplexer.java?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WeightedRoundRobinMultiplexer.java
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WeightedRoundRobinMultiplexer.java
Sat Aug 23 07:49:41 2014
@@ -38,7 +38,7 @@ import org.apache.hadoop.conf.Configurat
* There may be more reads than the minimum due to race conditions. This is
* allowed by design for performance reasons.
*/
-public class WeightedRoundRobinMultiplexer {
+public class WeightedRoundRobinMultiplexer implements RpcMultiplexer {
// Config keys
public static final String IPC_CALLQUEUE_WRRMUX_WEIGHTS_KEY =
"faircallqueue.multiplexer.weights";
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
Sat Aug 23 07:49:41 2014
@@ -18,23 +18,25 @@
package org.apache.hadoop.util;
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.net.URLClassLoader;
+import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.File;
-import java.util.regex.Pattern;
-import java.util.Arrays;
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Enumeration;
-import java.util.jar.JarFile;
+import java.util.List;
import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
import java.util.jar.Manifest;
+import java.util.regex.Pattern;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -56,6 +58,21 @@ public class RunJar {
public static final int SHUTDOWN_HOOK_PRIORITY = 10;
/**
+ * Environment key for using the client classloader.
+ */
+ public static final String HADOOP_USE_CLIENT_CLASSLOADER =
+ "HADOOP_USE_CLIENT_CLASSLOADER";
+ /**
+ * Environment key for the (user-provided) hadoop classpath.
+ */
+ public static final String HADOOP_CLASSPATH = "HADOOP_CLASSPATH";
+ /**
+ * Environment key for the system classes.
+ */
+ public static final String HADOOP_CLIENT_CLASSLOADER_SYSTEM_CLASSES =
+ "HADOOP_CLIENT_CLASSLOADER_SYSTEM_CLASSES";
+
+ /**
* Unpack a jar file into a directory.
*
* This version unpacks all files inside the jar regardless of filename.
@@ -116,6 +133,10 @@ public class RunJar {
/** Run a Hadoop job jar. If the main class is not in the jar's manifest,
* then it must be provided on the command line. */
public static void main(String[] args) throws Throwable {
+ new RunJar().run(args);
+ }
+
+ public void run(String[] args) throws Throwable {
String usage = "RunJar jarFile [mainClass] args...";
if (args.length < 1) {
@@ -187,19 +208,7 @@ public class RunJar {
unJar(file, workDir);
- ArrayList<URL> classPath = new ArrayList<URL>();
- classPath.add(new File(workDir+"/").toURI().toURL());
- classPath.add(file.toURI().toURL());
- classPath.add(new File(workDir, "classes/").toURI().toURL());
- File[] libs = new File(workDir, "lib").listFiles();
- if (libs != null) {
- for (int i = 0; i < libs.length; i++) {
- classPath.add(libs[i].toURI().toURL());
- }
- }
-
- ClassLoader loader =
- new URLClassLoader(classPath.toArray(new URL[0]));
+ ClassLoader loader = createClassLoader(file, workDir);
Thread.currentThread().setContextClassLoader(loader);
Class<?> mainClass = Class.forName(mainClassName, true, loader);
@@ -214,5 +223,65 @@ public class RunJar {
throw e.getTargetException();
}
}
-
+
+ /**
+ * Creates a classloader based on the environment that was specified by the
+ * user. If HADOOP_USE_CLIENT_CLASSLOADER is specified, it creates an
+ * application classloader that provides the isolation of the user class
space
+ * from the hadoop classes and their dependencies. It forms a class space for
+ * the user jar as well as the HADOOP_CLASSPATH. Otherwise, it creates a
+ * classloader that simply adds the user jar to the classpath.
+ */
+ private ClassLoader createClassLoader(File file, final File workDir)
+ throws MalformedURLException {
+ ClassLoader loader;
+ // see if the client classloader is enabled
+ if (useClientClassLoader()) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(workDir+"/").
+ append(File.pathSeparator).append(file).
+ append(File.pathSeparator).append(workDir+"/classes/").
+ append(File.pathSeparator).append(workDir+"/lib/*");
+ // HADOOP_CLASSPATH is added to the client classpath
+ String hadoopClasspath = getHadoopClasspath();
+ if (hadoopClasspath != null && !hadoopClasspath.isEmpty()) {
+ sb.append(File.pathSeparator).append(hadoopClasspath);
+ }
+ String clientClasspath = sb.toString();
+ // get the system classes
+ String systemClasses = getSystemClasses();
+ List<String> systemClassesList = systemClasses == null ?
+ null :
+ Arrays.asList(StringUtils.getTrimmedStrings(systemClasses));
+ // create an application classloader that isolates the user classes
+ loader = new ApplicationClassLoader(clientClasspath,
+ getClass().getClassLoader(), systemClassesList);
+ } else {
+ List<URL> classPath = new ArrayList<URL>();
+ classPath.add(new File(workDir+"/").toURI().toURL());
+ classPath.add(file.toURI().toURL());
+ classPath.add(new File(workDir, "classes/").toURI().toURL());
+ File[] libs = new File(workDir, "lib").listFiles();
+ if (libs != null) {
+ for (int i = 0; i < libs.length; i++) {
+ classPath.add(libs[i].toURI().toURL());
+ }
+ }
+ // create a normal parent-delegating classloader
+ loader = new URLClassLoader(classPath.toArray(new URL[0]));
+ }
+ return loader;
+ }
+
+ boolean useClientClassLoader() {
+ return Boolean.parseBoolean(System.getenv(HADOOP_USE_CLIENT_CLASSLOADER));
+ }
+
+ String getHadoopClasspath() {
+ return System.getenv(HADOOP_CLASSPATH);
+ }
+
+ String getSystemClasses() {
+ return System.getenv(HADOOP_CLIENT_CLASSLOADER_SYSTEM_CLASSES);
+ }
}
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/hadoop_user_info.c
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/hadoop_user_info.c?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/hadoop_user_info.c
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/hadoop_user_info.c
Sat Aug 23 07:49:41 2014
@@ -193,7 +193,17 @@ int hadoop_user_info_getgroups(struct ha
ngroups = uinfo->gids_size;
ret = getgrouplist(uinfo->pwd.pw_name, uinfo->pwd.pw_gid,
uinfo->gids, &ngroups);
+ // Return value is different on Linux vs. FreeBSD. Linux: the number of
groups
+ // or -1 on error. FreeBSD: 0 on success or -1 on error. Unfortunately, we
+ // can't accept a 0 return on Linux, because buggy implementations have been
+ // observed to return 0 but leave the other out parameters in an
indeterminate
+ // state. This deviates from the man page, but it has been observed in
+ // practice. See issue HADOOP-10989 for details.
+#ifdef __linux__
+ if (ret > 0) {
+#else
if (ret >= 0) {
+#endif
uinfo->num_gids = ngroups;
ret = put_primary_gid_first(uinfo);
if (ret) {
Modified:
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java?rev=1619980&r1=1619979&r2=1619980&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java
(original)
+++
hadoop/common/branches/HDFS-6581/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java
Sat Aug 23 07:49:41 2014
@@ -17,23 +17,30 @@
*/
package org.apache.hadoop.util;
-import junit.framework.TestCase;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.jar.JarOutputStream;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
+import junit.framework.TestCase;
+
+import org.apache.hadoop.fs.FileUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.hadoop.fs.FileUtil;
public class TestRunJar extends TestCase {
private File TEST_ROOT_DIR;
private static final String TEST_JAR_NAME="test-runjar.jar";
+ private static final String TEST_JAR_2_NAME = "test-runjar2.jar";
@Override
@Before
@@ -107,4 +114,59 @@ public class TestRunJar extends TestCase
new File(unjarDir, "foobaz.txt").exists());
}
+
+ /**
+ * Tests the client classloader to verify the main class and its dependent
+ * class are loaded correctly by the application classloader, and others are
+ * loaded by the system classloader.
+ */
+ @Test
+ public void testClientClassLoader() throws Throwable {
+ RunJar runJar = spy(new RunJar());
+ // enable the client classloader
+ when(runJar.useClientClassLoader()).thenReturn(true);
+ // set the system classes and blacklist the test main class and the test
+ // third class so they can be loaded by the application classloader
+ String mainCls = ClassLoaderCheckMain.class.getName();
+ String thirdCls = ClassLoaderCheckThird.class.getName();
+ String systemClasses = "-" + mainCls + "," +
+ "-" + thirdCls + "," +
+ ApplicationClassLoader.DEFAULT_SYSTEM_CLASSES;
+ when(runJar.getSystemClasses()).thenReturn(systemClasses);
+
+ // create the test jar
+ File testJar = makeClassLoaderTestJar(mainCls, thirdCls);
+ // form the args
+ String[] args = new String[3];
+ args[0] = testJar.getAbsolutePath();
+ args[1] = mainCls;
+
+ // run RunJar
+ runJar.run(args);
+ // it should not throw an exception
+ }
+
+ private File makeClassLoaderTestJar(String... clsNames) throws IOException {
+ File jarFile = new File(TEST_ROOT_DIR, TEST_JAR_2_NAME);
+ JarOutputStream jstream =
+ new JarOutputStream(new FileOutputStream(jarFile));
+ for (String clsName: clsNames) {
+ String name = clsName.replace('.', '/') + ".class";
+ InputStream entryInputStream = this.getClass().getResourceAsStream(
+ "/" + name);
+ ZipEntry entry = new ZipEntry(name);
+ jstream.putNextEntry(entry);
+ BufferedInputStream bufInputStream = new BufferedInputStream(
+ entryInputStream, 2048);
+ int count;
+ byte[] data = new byte[2048];
+ while ((count = bufInputStream.read(data, 0, 2048)) != -1) {
+ jstream.write(data, 0, count);
+ }
+ jstream.closeEntry();
+ }
+ jstream.close();
+
+ return jarFile;
+ }
}
\ No newline at end of file
