svn commit: r1331275 - /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
Author: damjan
Date: Fri Apr 27 07:54:02 2012
New Revision: 1331275
URL: http://svn.apache.org/viewvc?rev=1331275view=rev
Log:
Stop JpegImageMetadata from throwing NPE if the exif field is null.
Jira issue key: SANSELAN-73
Submitted by: Piyush Kapoor pkapoor at adobe dot com
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java?rev=1331275r1=1331274r2=1331275view=diff
==
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
Fri Apr 27 07:54:02 2012
@@ -55,7 +55,11 @@ public class JpegImageMetadata implement
public TiffField findEXIFValue(TagInfo tagInfo) {
try {
-return exif.findField(tagInfo);
+if (exif != null) {
+ return exif.findField(tagInfo);
+} else {
+ return null;
+}
} catch (ImageReadException cannotHappen) {
return null;
}
@@ -217,4 +221,4 @@ public class JpegImageMetadata implement
Debug.debug(this.toString());
}
-}
\ No newline at end of file
+}
svn commit: r1331283 - /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
Author: damjan
Date: Fri Apr 27 07:59:10 2012
New Revision: 1331283
URL: http://svn.apache.org/viewvc?rev=1331283view=rev
Log:
Make all JpegImageMetadata methods handle a null exif field.
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java?rev=1331283r1=1331282r2=1331283view=diff
==
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
Fri Apr 27 07:59:10 2012
@@ -67,7 +67,11 @@ public class JpegImageMetadata implement
public TiffField findEXIFValueWithExactMatch(TagInfo tagInfo) {
try {
-return exif.findField(tagInfo, true);
+if (exif != null) {
+return exif.findField(tagInfo, true);
+} else {
+return null;
+}
} catch (ImageReadException cannotHappen) {
return null;
}
@@ -97,6 +101,9 @@ public class JpegImageMetadata implement
* @throws IOException
*/
public byte[] getEXIFThumbnailData() throws ImageReadException,
IOException {
+if (exif == null) {
+return null;
+}
List? extends IImageMetadataItem dirs = exif.getDirectories();
for (int i = 0; i dirs.size(); i++) {
TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory)
dirs
@@ -155,6 +162,9 @@ public class JpegImageMetadata implement
}
public TiffImageData getRawImageData() {
+if (exif == null) {
+return null;
+}
List? extends IImageMetadataItem dirs = exif.getDirectories();
for (int i = 0; i dirs.size(); i++) {
TiffImageMetadata.Directory dir = (TiffImageMetadata.Directory)
dirs
svn commit: r1331291 - in /commons/proper/imaging/trunk/src: main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java test/data/images/tiff/4/ test/
Author: damjan
Date: Fri Apr 27 08:21:25 2012
New Revision: 1331291
URL: http://svn.apache.org/viewvc?rev=1331291view=rev
Log:
Speed up reading paletted TIFF files.
Jira issue key: SANSELAN-75
Submitted by: Gary Lucas gwlucas at sonalysts dot com
Added:
commons/proper/imaging/trunk/src/test/data/images/tiff/4/
commons/proper/imaging/trunk/src/test/data/images/tiff/4/IndexColorPalette.tif
(with props)
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java?rev=1331291r1=1331290r2=1331291view=diff
==
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
Fri Apr 27 08:21:25 2012
@@ -24,6 +24,13 @@ import org.apache.commons.imaging.common
public class PhotometricInterpreterPalette extends PhotometricInterpreter
{
private final int[] fColorMap;
+
+/**
+ * The color map of integer ARGB values tied to the
+ * pixel index of the palette
+ */
+private final int[] indexColorMap;
+
public PhotometricInterpreterPalette(int fSamplesPerPixel,
int fBitsPerSample[], int Predictor, int width, int height,
@@ -32,24 +39,26 @@ public class PhotometricInterpreterPalet
super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
this.fColorMap = fColorMap;
+
+int fBitsPerPixel = bitsPerSample[0];
+int colormap_scale = (1 fBitsPerPixel);
+indexColorMap = new int[colormap_scale];
+for (int index = 0; index colormap_scale; index++)
+{
+int red = (fColorMap[index]8)0xff;
+int green = (fColorMap[index + (colormap_scale)]8)0xff;
+int blue = (fColorMap[index + (2 * colormap_scale)]8)0xff;
+indexColorMap[index] =
+0xff00 | (red 16) | (green 8) | blue;
+}
+
+
}
@Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int
x, int y)
throws ImageReadException, IOException
{
-int fBitsPerPixel = bitsPerSample[0];
-int colormap_scale = (1 fBitsPerPixel);
-//int expected_colormap_size = 3 * (1 fBitsPerPixel);
-
-int index = samples[0];
-int red = fColorMap[index] 8;
-int green = fColorMap[index + (colormap_scale)] 8;
-int blue = fColorMap[index + (2 * colormap_scale)] 8;
-
-int alpha = 0xff;
-int rgb = (alpha 24) | (red 16) | (green 8) | (blue 0);
-imageBuilder.setRGB(x, y, rgb);
-
+imageBuilder.setRGB(x, y, indexColorMap[samples[0]]);
}
}
\ No newline at end of file
Added:
commons/proper/imaging/trunk/src/test/data/images/tiff/4/IndexColorPalette.tif
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/data/images/tiff/4/IndexColorPalette.tif?rev=1331291view=auto
==
Binary file - no diff available.
Propchange:
commons/proper/imaging/trunk/src/test/data/images/tiff/4/IndexColorPalette.tif
--
svn:mime-type = image/tiff
svn commit: r1331325 - in /commons/proper/imaging/trunk/src: main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewrite
Author: damjan
Date: Fri Apr 27 09:54:55 2012
New Revision: 1331325
URL: http://svn.apache.org/viewvc?rev=1331325view=rev
Log:
Allow TIFF fields to change size during encoding.
Fix a broken test that assumes they never do.
Jira issue key: SANSELAN-77
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java?rev=1331325r1=1331324r2=1331325view=diff
==
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
Fri Apr 27 09:54:55 2012
@@ -164,7 +164,6 @@ public class TiffImageMetadata extends I
TagInfo tagInfo = srcField.tagInfo;
FieldType fieldType = srcField.fieldType;
-int count = srcField.length;
//byte bytes[] =
srcField.fieldType.getRawBytes(srcField);
//Debug.debug(tagInfo, tagInfo);
@@ -182,6 +181,7 @@ public class TiffImageMetadata extends I
//+
Integer.toHexString(srcField.tag)
//+ ) bytes,
bytes);
+int count = bytes.length / fieldType.length;
TiffOutputField dstField = new TiffOutputField(
srcField.tag, tagInfo, fieldType, count, bytes);
dstField.setSortHint(srcField.getSortHint());
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1331325r1=1331324r2=1331325view=diff
==
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
Fri Apr 27 09:54:55 2012
@@ -419,16 +419,7 @@ public class ExifRewriteTest extends Exi
assertEquals(oldField.tag, newField.tag);
assertEquals(dirType.intValue(), newField.directoryType);
assertEquals(oldField.directoryType, newField.directoryType);
-assertEquals(oldField.length, newField.length);
-assertEquals(oldField.isLocalValue(), newField.isLocalValue());
-
-if (oldField.tag == 0x202)
-{
-// ignore jpg from raw length value. may have off-by-one
bug in certain cameras.
-// i.e. Sony DCR-PC110
-continue;
-}
-
+
if (oldField.fieldType ==
TiffFieldTypeConstants.FIELD_TYPE_ASCII)
{
// Sanselan currently doesn't correctly rewrite
@@ -448,6 +439,16 @@ public class ExifRewriteTest extends Exi
continue;
}
+assertEquals(oldField.length, newField.length);
+assertEquals(oldField.isLocalValue(), newField.isLocalValue());
+
+if (oldField.tag == 0x202)
+{
+// ignore jpg from raw length value. may have off-by-one
bug in certain cameras.
+// i.e. Sony DCR-PC110
+continue;
+}
+
if (!oldField.tagInfo.isOffset())
{
if (oldField.tagInfo.isText())
svn commit: r1331338 - in /commons/proper/commons-parent/tags/commons-parent-25-RC1: ./ pom.xml
Author: sebb Date: Fri Apr 27 10:21:24 2012 New Revision: 1331338 URL: http://svn.apache.org/viewvc?rev=1331338view=rev Log: Prepare CP 25 RC1 Added: commons/proper/commons-parent/tags/commons-parent-25-RC1/ - copied from r1331337, commons/proper/commons-parent/trunk/ Modified: commons/proper/commons-parent/tags/commons-parent-25-RC1/pom.xml Modified: commons/proper/commons-parent/tags/commons-parent-25-RC1/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/tags/commons-parent-25-RC1/pom.xml?rev=1331338r1=1331337r2=1331338view=diff == --- commons/proper/commons-parent/tags/commons-parent-25-RC1/pom.xml (original) +++ commons/proper/commons-parent/tags/commons-parent-25-RC1/pom.xml Fri Apr 27 10:21:24 2012 @@ -29,7 +29,7 @@ artifactIdcommons-parent/artifactId packagingpom/packaging !-- Must agree with commons.release.version below -- - version25-SNAPSHOT/version + version25/version nameCommons Parent/name urlhttp://commons.apache.org//url descriptionThe Apache Commons Parent Pom provides common settings for all Apache Commons components./description
Nexus: Staging Completed.
Description:Lazy consensus vote for CP25 RC1Details:The following artifacts have been staged to the org.apache.commons-003 (u:sebb, a:80.176.146.62) repository.archetype-catalog.xmlcommons-parent-25.pom.asccommons-parent-25-site.xmlcommons-parent-25.pom
svn commit: r1331344 - in /commons/proper/commons-parent/trunk: RELEASE-NOTES.txt src/changes/changes.xml
Author: sebb Date: Fri Apr 27 10:43:07 2012 New Revision: 1331344 URL: http://svn.apache.org/viewvc?rev=1331344view=rev Log: Regenerate RN Modified: commons/proper/commons-parent/trunk/RELEASE-NOTES.txt commons/proper/commons-parent/trunk/src/changes/changes.xml Modified: commons/proper/commons-parent/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/RELEASE-NOTES.txt?rev=1331344r1=1331343r2=1331344view=diff == --- commons/proper/commons-parent/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/commons-parent/trunk/RELEASE-NOTES.txt Fri Apr 27 10:43:07 2012 @@ -1,33 +1,19 @@ - Apache Commons Parent 24 RELEASE NOTES + Apache Commons Parent 25 RELEASE NOTES -The Commons Parent team is pleased to announce the release of Commons Parent 24 +The Commons Parent team is pleased to announce the release of Commons Parent 25 The Apache Commons Parent Pom provides common settings for all Apache Commons components. -Update and add plugins +Update plugins Changes in this version include: Changes: o Updated various plugin versions: -antrun: 1.6 = 1.7 -assembly: 2.2.1 = 2.3 -jar: 2.3.2 = 2.4 -release: 2.2.1 = 2.2.2 -remote-resources: override Apache pom 9 with 1.2.1 -commons-build: 1.3 = 1.4 -bundle: 2.3.5 = 2.3.7; removed workround for Java 1.5 as no longer necessary -Added cobertura: 2.5.1 to reporting and buildManagement -surefire: 2.9 = 2.12 -surefire-report: 2.9 = 2.12 -Allow override of surefire-report aggregate setting using property commons.surefire-report.aggregate -javadoc: 2.8 = 2.8.1 -rat: 0.7 = 0.8 -wagon-ssh 1.0 = 2.2 (M3 only) -Deleted ci profile (does not apply with Nexus) -Add default project info reports: excluded license/plugins/plugin management -Add tests.jar and test-sources.jar to deployed files +clirr-maven-plugin: 2.3 = 2.4 +clirr and RAT added to pluginManagement so can override the version from Apache POM +Add changes and jira reports Historical list of changes: http://commons.apache.org/changes-report.html Modified: commons/proper/commons-parent/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/src/changes/changes.xml?rev=1331344r1=1331343r2=1331344view=diff == --- commons/proper/commons-parent/trunk/src/changes/changes.xml (original) +++ commons/proper/commons-parent/trunk/src/changes/changes.xml Fri Apr 27 10:43:07 2012 @@ -60,7 +60,7 @@ The action type attribute can be add,u action type=update Updated various plugin versions: clirr-maven-plugin: 2.3 = 2.4 -clirr RAT added to pluginManagement so can override the version from Apache POM +clirr and RAT added to pluginManagement so can override the version from Apache POM Add changes and jira reports /action /release
svn commit: r1331345 - in /commons/proper/commons-parent/tags/commons-parent-25-RC2: ./ pom.xml
Author: sebb Date: Fri Apr 27 10:44:28 2012 New Revision: 1331345 URL: http://svn.apache.org/viewvc?rev=1331345view=rev Log: Prepare CP 25 RC2 Added: commons/proper/commons-parent/tags/commons-parent-25-RC2/ - copied from r1331344, commons/proper/commons-parent/trunk/ Modified: commons/proper/commons-parent/tags/commons-parent-25-RC2/pom.xml Modified: commons/proper/commons-parent/tags/commons-parent-25-RC2/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/tags/commons-parent-25-RC2/pom.xml?rev=1331345r1=1331344r2=1331345view=diff == --- commons/proper/commons-parent/tags/commons-parent-25-RC2/pom.xml (original) +++ commons/proper/commons-parent/tags/commons-parent-25-RC2/pom.xml Fri Apr 27 10:44:28 2012 @@ -29,7 +29,7 @@ artifactIdcommons-parent/artifactId packagingpom/packaging !-- Must agree with commons.release.version below -- - version25-SNAPSHOT/version + version25/version nameCommons Parent/name urlhttp://commons.apache.org//url descriptionThe Apache Commons Parent Pom provides common settings for all Apache Commons components./description
Nexus: Staging Repository Dropped.
Description:Forgot to update RNDetails:The org.apache.commons-003 (u:sebb, a:80.176.146.62) staging repository has been dropped.
Nexus: Staging Completed.
Description:CP25 RC2, fixed RNDetails:The following artifacts have been staged to the org.apache.commons-004 (u:sebb, a:80.176.146.62) repository.archetype-catalog.xmlcommons-parent-25.pom.asccommons-parent-25-site.xmlcommons-parent-25.pom
svn commit: r1331349 - /commons/proper/commons-parent/tags/commons-parent-25-RC1/
Author: sebb Date: Fri Apr 27 10:53:31 2012 New Revision: 1331349 URL: http://svn.apache.org/viewvc?rev=1331349view=rev Log: Not used Removed: commons/proper/commons-parent/tags/commons-parent-25-RC1/
svn commit: r1331378 - in /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl: DefaultEvictionPolicy.java EvictionConfig.java
Author: sebb
Date: Fri Apr 27 12:18:17 2012
New Revision: 1331378
URL: http://svn.apache.org/viewvc?rev=1331378view=rev
Log:
Javadoc
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionConfig.java
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java?rev=1331378r1=1331377r2=1331378view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultEvictionPolicy.java
Fri Apr 27 12:18:17 2012
@@ -29,6 +29,7 @@ package org.apache.commons.pool2.impl;
* {@link GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} /
* {@link GenericKeyedObjectPool#getSoftMinEvictableIdleTimeMillis()}
* /ul
+ * This class is immutable and thread-safe
*/
public class DefaultEvictionPolicyT implements EvictionPolicyT {
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionConfig.java?rev=1331378r1=1331377r2=1331378view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionConfig.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/EvictionConfig.java
Fri Apr 27 12:18:17 2012
@@ -20,6 +20,8 @@ package org.apache.commons.pool2.impl;
* This class is used by pool implementations to pass configuration information
* to {@link EvictionPolicy} instances. The {@link EvictionPolicy} may also
have
* its own specific configuration attributes.
+ * p
+ * This class is immutable and thread-safe
*/
public class EvictionConfig {
svn commit: r1331380 - /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Author: sebb
Date: Fri Apr 27 12:18:47 2012
New Revision: 1331380
URL: http://svn.apache.org/viewvc?rev=1331380view=rev
Log:
Make immutable private field final
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1331380r1=1331379r2=1331380view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Fri Apr 27 12:18:47 2012
@@ -1176,7 +1176,7 @@ public class GenericKeyedObjectPoolK,T
*
* pDestroys idle instances in the pool by invoking {@link #clear()}./p
*
- * @throws Exception
+ * @throws RuntimeException
*/
@Override
public void close() {
@@ -2281,7 +2281,7 @@ public class GenericKeyedObjectPoolK,T
* environment the context class loader for the evictor thread may have
* visibility of the correct factory. See POOL-161.
*/
-private ClassLoader factoryClassLoader = null;
+private final ClassLoader factoryClassLoader;
/**
* My hash of pools (ObjectQueue). The list of keys bmust/b be kept in
svn commit: r1331381 - /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Author: sebb
Date: Fri Apr 27 12:20:09 2012
New Revision: 1331381
URL: http://svn.apache.org/viewvc?rev=1331381view=rev
Log:
Make immutable private field final
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1331381r1=1331380r2=1331381view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Fri Apr 27 12:20:09 2012
@@ -1038,7 +1038,7 @@ public class GenericObjectPoolT extend
* Destroys idle instances in the pool by invoking {@link #clear()}.
* /p
*
- * @throws Exception
+ * @throws RuntimeException
*/
@Override
public void close() {
@@ -1624,7 +1624,7 @@ public class GenericObjectPoolT extend
* environment the context class loader for the evictor thread may have
* visibility of the correct factory. See POOL-161.
*/
-private ClassLoader factoryClassLoader = null;
+private final ClassLoader factoryClassLoader;
/**
* All of the objects currently associated with this pool in any state. It
svn commit: r1331383 - /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java
Author: sebb Date: Fri Apr 27 12:25:51 2012 New Revision: 1331383 URL: http://svn.apache.org/viewvc?rev=1331383view=rev Log: Javadoc Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java?rev=1331383r1=1331382r2=1331383view=diff == --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java (original) +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPoolableObjectFactory.java Fri Apr 27 12:25:51 2012 @@ -22,7 +22,8 @@ package org.apache.commons.pool2; * p * All operations defined here are essentially no-op's. * /p - * + * This class is immutable, and therefore thread-safe. + * * @see KeyedPoolableObjectFactory * * @param K The type of keys managed by this factory.
svn commit: r1331392 - /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
Author: sebb Date: Fri Apr 27 12:37:43 2012 New Revision: 1331392 URL: http://svn.apache.org/viewvc?rev=1331392view=rev Log: No need for field to be protected; this class is only intended for use by GKOP/GOP which are in the same package Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java?rev=1331392r1=1331391r2=1331392view=diff == --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java (original) +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java Fri Apr 27 12:37:43 2012 @@ -54,7 +54,7 @@ public abstract class BaseGenericObjectP // None as yet // Internal state attributes -protected volatile boolean closed = false; +volatile boolean closed = false; // Monitoring (primarily JMX) attributes private final NotificationBroadcasterSupport jmxNotificationSupport;
svn commit: r1331415 - /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Author: sebb
Date: Fri Apr 27 13:09:20 2012
New Revision: 1331415
URL: http://svn.apache.org/viewvc?rev=1331415view=rev
Log:
Correction; close does not access the fields directly
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1331415r1=1331414r2=1331415view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Fri Apr 27 13:09:20 2012
@@ -2319,12 +2319,12 @@ public class GenericKeyedObjectPoolK,T
* An iterator for {@link ObjectDeque#getIdleObjects()} that is used by the
* evictor.
*/
-private IteratorPooledObjectT evictionIterator = null; //
@GuardedBy(evictionLock) - except close()
+private IteratorPooledObjectT evictionIterator = null; //
@GuardedBy(evictionLock)
/**
* An iterator for {@link #poolMap} entries.
*/
-private IteratorK evictionKeyIterator = null; //
@GuardedBy(evictionLock) - except close()
+private IteratorK evictionKeyIterator = null; //
@GuardedBy(evictionLock)
/**
* The key associated with the {@link ObjectDeque#getIdleObjects()}
svn commit: r1331635 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java
Author: erans
Date: Fri Apr 27 23:30:41 2012
New Revision: 1331635
URL: http://svn.apache.org/viewvc?rev=1331635view=rev
Log:
MATH-782
Location of user-defined convergence check.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java?rev=1331635r1=1331634r2=1331635view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java
Fri Apr 27 23:30:41 2012
@@ -220,6 +220,16 @@ public class BrentOptimizer extends Base
fu = -fu;
}
+// User-defined convergence checker.
+previous = current;
+current = new UnivariatePointValuePair(u, isMinim ? fu : -fu);
+
+if (checker != null) {
+if (checker.converged(iter, previous, current)) {
+return current;
+}
+}
+
// Update a, b, v, w and x.
if (fu = fx) {
if (u x) {
@@ -233,16 +243,6 @@ public class BrentOptimizer extends Base
fw = fx;
x = u;
fx = fu;
-
-// User-defined convergence checker.
-previous = current;
-current = new UnivariatePointValuePair(x, isMinim ? fx :
-fx);
-
-if (checker != null) {
-if (checker.converged(iter, previous, current)) {
-return current;
-}
-}
} else {
if (u x) {
a = u;
