http://git-wip-us.apache.org/repos/asf/hbase-site/blob/22cff34f/apidocs/src-html/org/apache/hadoop/hbase/io/crypto/Encryption.Context.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/io/crypto/Encryption.Context.html b/apidocs/src-html/org/apache/hadoop/hbase/io/crypto/Encryption.Context.html index 3e217b2..99a73b9 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/io/crypto/Encryption.Context.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/io/crypto/Encryption.Context.html @@ -541,56 +541,55 @@ <span class="sourceLineNo">533</span> }<a name="line.533"></a> <span class="sourceLineNo">534</span> }<a name="line.534"></a> <span class="sourceLineNo">535</span><a name="line.535"></a> -<span class="sourceLineNo">536</span> static final Map<Pair<String,String>,KeyProvider> keyProviderCache =<a name="line.536"></a> -<span class="sourceLineNo">537</span> new ConcurrentHashMap<Pair<String,String>,KeyProvider>();<a name="line.537"></a> -<span class="sourceLineNo">538</span><a name="line.538"></a> -<span class="sourceLineNo">539</span> public static KeyProvider getKeyProvider(Configuration conf) {<a name="line.539"></a> -<span class="sourceLineNo">540</span> String providerClassName = conf.get(HConstants.CRYPTO_KEYPROVIDER_CONF_KEY,<a name="line.540"></a> -<span class="sourceLineNo">541</span> KeyStoreKeyProvider.class.getName());<a name="line.541"></a> -<span class="sourceLineNo">542</span> String providerParameters = conf.get(HConstants.CRYPTO_KEYPROVIDER_PARAMETERS_KEY, "");<a name="line.542"></a> -<span class="sourceLineNo">543</span> try {<a name="line.543"></a> -<span class="sourceLineNo">544</span> Pair<String,String> providerCacheKey = new Pair<String,String>(providerClassName,<a name="line.544"></a> -<span class="sourceLineNo">545</span> providerParameters);<a name="line.545"></a> -<span class="sourceLineNo">546</span> KeyProvider provider = keyProviderCache.get(providerCacheKey);<a name="line.546"></a> -<span class="sourceLineNo">547</span> if (provider != null) {<a name="line.547"></a> -<span class="sourceLineNo">548</span> return provider;<a name="line.548"></a> -<span class="sourceLineNo">549</span> }<a name="line.549"></a> -<span class="sourceLineNo">550</span> provider = (KeyProvider) ReflectionUtils.newInstance(<a name="line.550"></a> -<span class="sourceLineNo">551</span> getClassLoaderForClass(KeyProvider.class).loadClass(providerClassName),<a name="line.551"></a> -<span class="sourceLineNo">552</span> conf);<a name="line.552"></a> -<span class="sourceLineNo">553</span> provider.init(providerParameters);<a name="line.553"></a> -<span class="sourceLineNo">554</span> if (LOG.isDebugEnabled()) {<a name="line.554"></a> -<span class="sourceLineNo">555</span> LOG.debug("Installed " + providerClassName + " into key provider cache");<a name="line.555"></a> -<span class="sourceLineNo">556</span> }<a name="line.556"></a> -<span class="sourceLineNo">557</span> keyProviderCache.put(providerCacheKey, provider);<a name="line.557"></a> -<span class="sourceLineNo">558</span> return provider;<a name="line.558"></a> -<span class="sourceLineNo">559</span> } catch (Exception e) {<a name="line.559"></a> -<span class="sourceLineNo">560</span> throw new RuntimeException(e);<a name="line.560"></a> -<span class="sourceLineNo">561</span> }<a name="line.561"></a> -<span class="sourceLineNo">562</span> }<a name="line.562"></a> -<span class="sourceLineNo">563</span><a name="line.563"></a> -<span class="sourceLineNo">564</span> public static void incrementIv(byte[] iv) {<a name="line.564"></a> -<span class="sourceLineNo">565</span> incrementIv(iv, 1);<a name="line.565"></a> -<span class="sourceLineNo">566</span> }<a name="line.566"></a> -<span class="sourceLineNo">567</span><a name="line.567"></a> -<span class="sourceLineNo">568</span> public static void incrementIv(byte[] iv, int v) {<a name="line.568"></a> -<span class="sourceLineNo">569</span> int length = iv.length;<a name="line.569"></a> -<span class="sourceLineNo">570</span> boolean carry = true;<a name="line.570"></a> -<span class="sourceLineNo">571</span> // TODO: Optimize for v > 1, e.g. 16, 32<a name="line.571"></a> -<span class="sourceLineNo">572</span> do {<a name="line.572"></a> -<span class="sourceLineNo">573</span> for (int i = 0; i < length; i++) {<a name="line.573"></a> -<span class="sourceLineNo">574</span> if (carry) {<a name="line.574"></a> -<span class="sourceLineNo">575</span> iv[i] = (byte) ((iv[i] + 1) & 0xFF);<a name="line.575"></a> -<span class="sourceLineNo">576</span> carry = 0 == iv[i];<a name="line.576"></a> -<span class="sourceLineNo">577</span> } else {<a name="line.577"></a> -<span class="sourceLineNo">578</span> break;<a name="line.578"></a> -<span class="sourceLineNo">579</span> }<a name="line.579"></a> -<span class="sourceLineNo">580</span> }<a name="line.580"></a> -<span class="sourceLineNo">581</span> v--;<a name="line.581"></a> -<span class="sourceLineNo">582</span> } while (v > 0);<a name="line.582"></a> -<span class="sourceLineNo">583</span> }<a name="line.583"></a> -<span class="sourceLineNo">584</span><a name="line.584"></a> -<span class="sourceLineNo">585</span>}<a name="line.585"></a> +<span class="sourceLineNo">536</span> static final Map<Pair<String,String>,KeyProvider> keyProviderCache = new ConcurrentHashMap<>();<a name="line.536"></a> +<span class="sourceLineNo">537</span><a name="line.537"></a> +<span class="sourceLineNo">538</span> public static KeyProvider getKeyProvider(Configuration conf) {<a name="line.538"></a> +<span class="sourceLineNo">539</span> String providerClassName = conf.get(HConstants.CRYPTO_KEYPROVIDER_CONF_KEY,<a name="line.539"></a> +<span class="sourceLineNo">540</span> KeyStoreKeyProvider.class.getName());<a name="line.540"></a> +<span class="sourceLineNo">541</span> String providerParameters = conf.get(HConstants.CRYPTO_KEYPROVIDER_PARAMETERS_KEY, "");<a name="line.541"></a> +<span class="sourceLineNo">542</span> try {<a name="line.542"></a> +<span class="sourceLineNo">543</span> Pair<String,String> providerCacheKey = new Pair<>(providerClassName,<a name="line.543"></a> +<span class="sourceLineNo">544</span> providerParameters);<a name="line.544"></a> +<span class="sourceLineNo">545</span> KeyProvider provider = keyProviderCache.get(providerCacheKey);<a name="line.545"></a> +<span class="sourceLineNo">546</span> if (provider != null) {<a name="line.546"></a> +<span class="sourceLineNo">547</span> return provider;<a name="line.547"></a> +<span class="sourceLineNo">548</span> }<a name="line.548"></a> +<span class="sourceLineNo">549</span> provider = (KeyProvider) ReflectionUtils.newInstance(<a name="line.549"></a> +<span class="sourceLineNo">550</span> getClassLoaderForClass(KeyProvider.class).loadClass(providerClassName),<a name="line.550"></a> +<span class="sourceLineNo">551</span> conf);<a name="line.551"></a> +<span class="sourceLineNo">552</span> provider.init(providerParameters);<a name="line.552"></a> +<span class="sourceLineNo">553</span> if (LOG.isDebugEnabled()) {<a name="line.553"></a> +<span class="sourceLineNo">554</span> LOG.debug("Installed " + providerClassName + " into key provider cache");<a name="line.554"></a> +<span class="sourceLineNo">555</span> }<a name="line.555"></a> +<span class="sourceLineNo">556</span> keyProviderCache.put(providerCacheKey, provider);<a name="line.556"></a> +<span class="sourceLineNo">557</span> return provider;<a name="line.557"></a> +<span class="sourceLineNo">558</span> } catch (Exception e) {<a name="line.558"></a> +<span class="sourceLineNo">559</span> throw new RuntimeException(e);<a name="line.559"></a> +<span class="sourceLineNo">560</span> }<a name="line.560"></a> +<span class="sourceLineNo">561</span> }<a name="line.561"></a> +<span class="sourceLineNo">562</span><a name="line.562"></a> +<span class="sourceLineNo">563</span> public static void incrementIv(byte[] iv) {<a name="line.563"></a> +<span class="sourceLineNo">564</span> incrementIv(iv, 1);<a name="line.564"></a> +<span class="sourceLineNo">565</span> }<a name="line.565"></a> +<span class="sourceLineNo">566</span><a name="line.566"></a> +<span class="sourceLineNo">567</span> public static void incrementIv(byte[] iv, int v) {<a name="line.567"></a> +<span class="sourceLineNo">568</span> int length = iv.length;<a name="line.568"></a> +<span class="sourceLineNo">569</span> boolean carry = true;<a name="line.569"></a> +<span class="sourceLineNo">570</span> // TODO: Optimize for v > 1, e.g. 16, 32<a name="line.570"></a> +<span class="sourceLineNo">571</span> do {<a name="line.571"></a> +<span class="sourceLineNo">572</span> for (int i = 0; i < length; i++) {<a name="line.572"></a> +<span class="sourceLineNo">573</span> if (carry) {<a name="line.573"></a> +<span class="sourceLineNo">574</span> iv[i] = (byte) ((iv[i] + 1) & 0xFF);<a name="line.574"></a> +<span class="sourceLineNo">575</span> carry = 0 == iv[i];<a name="line.575"></a> +<span class="sourceLineNo">576</span> } else {<a name="line.576"></a> +<span class="sourceLineNo">577</span> break;<a name="line.577"></a> +<span class="sourceLineNo">578</span> }<a name="line.578"></a> +<span class="sourceLineNo">579</span> }<a name="line.579"></a> +<span class="sourceLineNo">580</span> v--;<a name="line.580"></a> +<span class="sourceLineNo">581</span> } while (v > 0);<a name="line.581"></a> +<span class="sourceLineNo">582</span> }<a name="line.582"></a> +<span class="sourceLineNo">583</span><a name="line.583"></a> +<span class="sourceLineNo">584</span>}<a name="line.584"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/22cff34f/apidocs/src-html/org/apache/hadoop/hbase/io/crypto/Encryption.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/io/crypto/Encryption.html b/apidocs/src-html/org/apache/hadoop/hbase/io/crypto/Encryption.html index 3e217b2..99a73b9 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/io/crypto/Encryption.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/io/crypto/Encryption.html @@ -541,56 +541,55 @@ <span class="sourceLineNo">533</span> }<a name="line.533"></a> <span class="sourceLineNo">534</span> }<a name="line.534"></a> <span class="sourceLineNo">535</span><a name="line.535"></a> -<span class="sourceLineNo">536</span> static final Map<Pair<String,String>,KeyProvider> keyProviderCache =<a name="line.536"></a> -<span class="sourceLineNo">537</span> new ConcurrentHashMap<Pair<String,String>,KeyProvider>();<a name="line.537"></a> -<span class="sourceLineNo">538</span><a name="line.538"></a> -<span class="sourceLineNo">539</span> public static KeyProvider getKeyProvider(Configuration conf) {<a name="line.539"></a> -<span class="sourceLineNo">540</span> String providerClassName = conf.get(HConstants.CRYPTO_KEYPROVIDER_CONF_KEY,<a name="line.540"></a> -<span class="sourceLineNo">541</span> KeyStoreKeyProvider.class.getName());<a name="line.541"></a> -<span class="sourceLineNo">542</span> String providerParameters = conf.get(HConstants.CRYPTO_KEYPROVIDER_PARAMETERS_KEY, "");<a name="line.542"></a> -<span class="sourceLineNo">543</span> try {<a name="line.543"></a> -<span class="sourceLineNo">544</span> Pair<String,String> providerCacheKey = new Pair<String,String>(providerClassName,<a name="line.544"></a> -<span class="sourceLineNo">545</span> providerParameters);<a name="line.545"></a> -<span class="sourceLineNo">546</span> KeyProvider provider = keyProviderCache.get(providerCacheKey);<a name="line.546"></a> -<span class="sourceLineNo">547</span> if (provider != null) {<a name="line.547"></a> -<span class="sourceLineNo">548</span> return provider;<a name="line.548"></a> -<span class="sourceLineNo">549</span> }<a name="line.549"></a> -<span class="sourceLineNo">550</span> provider = (KeyProvider) ReflectionUtils.newInstance(<a name="line.550"></a> -<span class="sourceLineNo">551</span> getClassLoaderForClass(KeyProvider.class).loadClass(providerClassName),<a name="line.551"></a> -<span class="sourceLineNo">552</span> conf);<a name="line.552"></a> -<span class="sourceLineNo">553</span> provider.init(providerParameters);<a name="line.553"></a> -<span class="sourceLineNo">554</span> if (LOG.isDebugEnabled()) {<a name="line.554"></a> -<span class="sourceLineNo">555</span> LOG.debug("Installed " + providerClassName + " into key provider cache");<a name="line.555"></a> -<span class="sourceLineNo">556</span> }<a name="line.556"></a> -<span class="sourceLineNo">557</span> keyProviderCache.put(providerCacheKey, provider);<a name="line.557"></a> -<span class="sourceLineNo">558</span> return provider;<a name="line.558"></a> -<span class="sourceLineNo">559</span> } catch (Exception e) {<a name="line.559"></a> -<span class="sourceLineNo">560</span> throw new RuntimeException(e);<a name="line.560"></a> -<span class="sourceLineNo">561</span> }<a name="line.561"></a> -<span class="sourceLineNo">562</span> }<a name="line.562"></a> -<span class="sourceLineNo">563</span><a name="line.563"></a> -<span class="sourceLineNo">564</span> public static void incrementIv(byte[] iv) {<a name="line.564"></a> -<span class="sourceLineNo">565</span> incrementIv(iv, 1);<a name="line.565"></a> -<span class="sourceLineNo">566</span> }<a name="line.566"></a> -<span class="sourceLineNo">567</span><a name="line.567"></a> -<span class="sourceLineNo">568</span> public static void incrementIv(byte[] iv, int v) {<a name="line.568"></a> -<span class="sourceLineNo">569</span> int length = iv.length;<a name="line.569"></a> -<span class="sourceLineNo">570</span> boolean carry = true;<a name="line.570"></a> -<span class="sourceLineNo">571</span> // TODO: Optimize for v > 1, e.g. 16, 32<a name="line.571"></a> -<span class="sourceLineNo">572</span> do {<a name="line.572"></a> -<span class="sourceLineNo">573</span> for (int i = 0; i < length; i++) {<a name="line.573"></a> -<span class="sourceLineNo">574</span> if (carry) {<a name="line.574"></a> -<span class="sourceLineNo">575</span> iv[i] = (byte) ((iv[i] + 1) & 0xFF);<a name="line.575"></a> -<span class="sourceLineNo">576</span> carry = 0 == iv[i];<a name="line.576"></a> -<span class="sourceLineNo">577</span> } else {<a name="line.577"></a> -<span class="sourceLineNo">578</span> break;<a name="line.578"></a> -<span class="sourceLineNo">579</span> }<a name="line.579"></a> -<span class="sourceLineNo">580</span> }<a name="line.580"></a> -<span class="sourceLineNo">581</span> v--;<a name="line.581"></a> -<span class="sourceLineNo">582</span> } while (v > 0);<a name="line.582"></a> -<span class="sourceLineNo">583</span> }<a name="line.583"></a> -<span class="sourceLineNo">584</span><a name="line.584"></a> -<span class="sourceLineNo">585</span>}<a name="line.585"></a> +<span class="sourceLineNo">536</span> static final Map<Pair<String,String>,KeyProvider> keyProviderCache = new ConcurrentHashMap<>();<a name="line.536"></a> +<span class="sourceLineNo">537</span><a name="line.537"></a> +<span class="sourceLineNo">538</span> public static KeyProvider getKeyProvider(Configuration conf) {<a name="line.538"></a> +<span class="sourceLineNo">539</span> String providerClassName = conf.get(HConstants.CRYPTO_KEYPROVIDER_CONF_KEY,<a name="line.539"></a> +<span class="sourceLineNo">540</span> KeyStoreKeyProvider.class.getName());<a name="line.540"></a> +<span class="sourceLineNo">541</span> String providerParameters = conf.get(HConstants.CRYPTO_KEYPROVIDER_PARAMETERS_KEY, "");<a name="line.541"></a> +<span class="sourceLineNo">542</span> try {<a name="line.542"></a> +<span class="sourceLineNo">543</span> Pair<String,String> providerCacheKey = new Pair<>(providerClassName,<a name="line.543"></a> +<span class="sourceLineNo">544</span> providerParameters);<a name="line.544"></a> +<span class="sourceLineNo">545</span> KeyProvider provider = keyProviderCache.get(providerCacheKey);<a name="line.545"></a> +<span class="sourceLineNo">546</span> if (provider != null) {<a name="line.546"></a> +<span class="sourceLineNo">547</span> return provider;<a name="line.547"></a> +<span class="sourceLineNo">548</span> }<a name="line.548"></a> +<span class="sourceLineNo">549</span> provider = (KeyProvider) ReflectionUtils.newInstance(<a name="line.549"></a> +<span class="sourceLineNo">550</span> getClassLoaderForClass(KeyProvider.class).loadClass(providerClassName),<a name="line.550"></a> +<span class="sourceLineNo">551</span> conf);<a name="line.551"></a> +<span class="sourceLineNo">552</span> provider.init(providerParameters);<a name="line.552"></a> +<span class="sourceLineNo">553</span> if (LOG.isDebugEnabled()) {<a name="line.553"></a> +<span class="sourceLineNo">554</span> LOG.debug("Installed " + providerClassName + " into key provider cache");<a name="line.554"></a> +<span class="sourceLineNo">555</span> }<a name="line.555"></a> +<span class="sourceLineNo">556</span> keyProviderCache.put(providerCacheKey, provider);<a name="line.556"></a> +<span class="sourceLineNo">557</span> return provider;<a name="line.557"></a> +<span class="sourceLineNo">558</span> } catch (Exception e) {<a name="line.558"></a> +<span class="sourceLineNo">559</span> throw new RuntimeException(e);<a name="line.559"></a> +<span class="sourceLineNo">560</span> }<a name="line.560"></a> +<span class="sourceLineNo">561</span> }<a name="line.561"></a> +<span class="sourceLineNo">562</span><a name="line.562"></a> +<span class="sourceLineNo">563</span> public static void incrementIv(byte[] iv) {<a name="line.563"></a> +<span class="sourceLineNo">564</span> incrementIv(iv, 1);<a name="line.564"></a> +<span class="sourceLineNo">565</span> }<a name="line.565"></a> +<span class="sourceLineNo">566</span><a name="line.566"></a> +<span class="sourceLineNo">567</span> public static void incrementIv(byte[] iv, int v) {<a name="line.567"></a> +<span class="sourceLineNo">568</span> int length = iv.length;<a name="line.568"></a> +<span class="sourceLineNo">569</span> boolean carry = true;<a name="line.569"></a> +<span class="sourceLineNo">570</span> // TODO: Optimize for v > 1, e.g. 16, 32<a name="line.570"></a> +<span class="sourceLineNo">571</span> do {<a name="line.571"></a> +<span class="sourceLineNo">572</span> for (int i = 0; i < length; i++) {<a name="line.572"></a> +<span class="sourceLineNo">573</span> if (carry) {<a name="line.573"></a> +<span class="sourceLineNo">574</span> iv[i] = (byte) ((iv[i] + 1) & 0xFF);<a name="line.574"></a> +<span class="sourceLineNo">575</span> carry = 0 == iv[i];<a name="line.575"></a> +<span class="sourceLineNo">576</span> } else {<a name="line.576"></a> +<span class="sourceLineNo">577</span> break;<a name="line.577"></a> +<span class="sourceLineNo">578</span> }<a name="line.578"></a> +<span class="sourceLineNo">579</span> }<a name="line.579"></a> +<span class="sourceLineNo">580</span> v--;<a name="line.580"></a> +<span class="sourceLineNo">581</span> } while (v > 0);<a name="line.581"></a> +<span class="sourceLineNo">582</span> }<a name="line.582"></a> +<span class="sourceLineNo">583</span><a name="line.583"></a> +<span class="sourceLineNo">584</span>}<a name="line.584"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/22cff34f/apidocs/src-html/org/apache/hadoop/hbase/mapred/GroupingTableMap.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapred/GroupingTableMap.html b/apidocs/src-html/org/apache/hadoop/hbase/mapred/GroupingTableMap.html index 12f1033..28e4d74 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/mapred/GroupingTableMap.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/mapred/GroupingTableMap.html @@ -124,7 +124,7 @@ <span class="sourceLineNo">116</span> */<a name="line.116"></a> <span class="sourceLineNo">117</span> protected byte[][] extractKeyValues(Result r) {<a name="line.117"></a> <span class="sourceLineNo">118</span> byte[][] keyVals = null;<a name="line.118"></a> -<span class="sourceLineNo">119</span> ArrayList<byte[]> foundList = new ArrayList<byte[]>();<a name="line.119"></a> +<span class="sourceLineNo">119</span> ArrayList<byte[]> foundList = new ArrayList<>();<a name="line.119"></a> <span class="sourceLineNo">120</span> int numCols = columns.length;<a name="line.120"></a> <span class="sourceLineNo">121</span> if (numCols > 0) {<a name="line.121"></a> <span class="sourceLineNo">122</span> for (Cell value: r.listCells()) {<a name="line.122"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/22cff34f/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html index fa09065..9ee386f 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/CopyTable.html @@ -128,7 +128,7 @@ <span class="sourceLineNo">120</span><a name="line.120"></a> <span class="sourceLineNo">121</span> if(families != null) {<a name="line.121"></a> <span class="sourceLineNo">122</span> String[] fams = families.split(",");<a name="line.122"></a> -<span class="sourceLineNo">123</span> Map<String,String> cfRenameMap = new HashMap<String,String>();<a name="line.123"></a> +<span class="sourceLineNo">123</span> Map<String,String> cfRenameMap = new HashMap<>();<a name="line.123"></a> <span class="sourceLineNo">124</span> for(String fam : fams) {<a name="line.124"></a> <span class="sourceLineNo">125</span> String sourceCf;<a name="line.125"></a> <span class="sourceLineNo">126</span> if(fam.contains(":")) {<a name="line.126"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/22cff34f/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/GroupingTableMapper.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/GroupingTableMapper.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/GroupingTableMapper.html index b4e55dd..9c96a34 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/GroupingTableMapper.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/GroupingTableMapper.html @@ -114,7 +114,7 @@ <span class="sourceLineNo">106</span> */<a name="line.106"></a> <span class="sourceLineNo">107</span> protected byte[][] extractKeyValues(Result r) {<a name="line.107"></a> <span class="sourceLineNo">108</span> byte[][] keyVals = null;<a name="line.108"></a> -<span class="sourceLineNo">109</span> ArrayList<byte[]> foundList = new ArrayList<byte[]>();<a name="line.109"></a> +<span class="sourceLineNo">109</span> ArrayList<byte[]> foundList = new ArrayList<>();<a name="line.109"></a> <span class="sourceLineNo">110</span> int numCols = columns.length;<a name="line.110"></a> <span class="sourceLineNo">111</span> if (numCols > 0) {<a name="line.111"></a> <span class="sourceLineNo">112</span> for (Cell value: r.listCells()) {<a name="line.112"></a>