You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/05/01 06:01:14 UTC
svn commit: r1477903 - in /subversion/branches/1.8.x: ./ STATUS
subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java
Author: svn-role
Date: Wed May 1 04:01:13 2013
New Revision: 1477903
URL: http://svn.apache.org/r1477903
Log:
Merge r1476359 from trunk:
* r1476359
JavaHL thread safety bug.
Justification:
Unexpected exceptions can be thrown when thread issues are encountered.
Votes:
+1: markphip, philip, brane
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
subversion/branches/1.8.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1476359
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1477903&r1=1477902&r2=1477903&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May 1 04:01:13 2013
@@ -80,13 +80,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1476359
- JavaHL thread safety bug.
- Justification:
- Unexpected exceptions can be thrown when thread issues are encountered.
- Votes:
- +1: markphip, philip, brane
-
* r1476193
Reset SQLite statements on error during 1.7 to 1.8 upgrade.
Justification:
Modified: subversion/branches/1.8.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java?rev=1477903&r1=1477902&r2=1477903&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java (original)
+++ subversion/branches/1.8.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java Wed May 1 04:01:13 2013
@@ -51,7 +51,11 @@ public class LogDate implements java.io.
{
throw new ParseException("String is not a valid Subversion date", 0);
}
- Date date = formatter.parse(datestr.substring(0, 23) + " UTC");
+ Date date;
+ synchronized(formatter)
+ {
+ date = formatter.parse(datestr.substring(0, 23) + " UTC");
+ }
this.cachedString = datestr;
cachedDate = Calendar.getInstance(UTC);
cachedDate.setTime(date);
Modified: subversion/branches/1.8.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java?rev=1477903&r1=1477902&r2=1477903&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java (original)
+++ subversion/branches/1.8.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java Wed May 1 04:01:13 2013
@@ -53,7 +53,11 @@ public class LogDate implements java.io.
{
throw new ParseException("String is not a valid Subversion date", 0);
}
- Date date = formatter.parse(datestr.substring(0, 23) + " UTC");
+ Date date;
+ synchronized(formatter)
+ {
+ date = formatter.parse(datestr.substring(0, 23) + " UTC");
+ }
this.cachedString = datestr;
cachedDate = Calendar.getInstance(UTC);
cachedDate.setTime(date);