svn commit: r1482192 - in /subversion/branches/1.7.x: ./ STATUS subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java

[svn-role]

Author: svn-role
Date: Tue May 14 04:01:58 2013
New Revision: 1482192

URL: http://svn.apache.org/r1482192
Log:
Merge r1476359 from trunk:

 * r1476359
   JavaHL thread safety bug.
   Justification:
     Unexpected exceptions can be thrown when thread issues are encountered.
   Votes:
     +1: markphip, stsp
     +0: rhuijben

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
    
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1476359

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1482192&r1=1482191&r2=1482192&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue May 14 04:01:58 2013
@@ -283,14 +283,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, stsp
-     +0: rhuijben
-
  * r1475724
    Fix changelist filtering when --changelist values aren't UTF8.
    Justification:

Modified: 
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java?rev=1482192&r1=1482191&r2=1482192&view=diff
==============================================================================
--- 
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
 (original)
+++ 
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
 Tue May 14 04:01:58 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.7.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java?rev=1482192&r1=1482191&r2=1482192&view=diff
==============================================================================
--- 
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java
 (original)
+++ 
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java
 Tue May 14 04:01:58 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);