svn commit: r1459835 - in /sis/branches/JDK7/sis-metadata/src: main/java/org/apache/sis/metadata/iso/acquisition/ main/java/org/apache/sis/metadata/iso/citation/ test/java/org/apache/sis/metadata/

[desruisseaux]

Author: desruisseaux
Date: Fri Mar 22 15:12:02 2013
New Revision: 1459835

URL: http://svn.apache.org/r1459835
Log:
Missing 'synchronized' keywords were causing test failures.
With this commit, the JDK7 branch is back to a buildable state.

Modified:
    
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
    
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
    
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java

Modified: 
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java?rev=1459835&r1=1459834&r2=1459835&view=diff
==============================================================================
--- 
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
 [UTF-8] Fri Mar 22 15:12:02 2013
@@ -134,7 +134,7 @@ public class DefaultObjective extends IS
      */
     @Override
     @XmlElement(name = "identifier", required = true)
-    public Collection<Identifier> getIdentifiers() {
+    public synchronized Collection<Identifier> getIdentifiers() {
         identifiers = nonNullCollection(identifiers, Identifier.class);
         return filterIdentifiers(identifiers);
     }

Modified: 
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java?rev=1459835&r1=1459834&r2=1459835&view=diff
==============================================================================
--- 
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
 [UTF-8] Fri Mar 22 15:12:02 2013
@@ -324,7 +324,7 @@ public class DefaultCitation extends ISO
      */
     @Override
     @XmlElement(name = "identifier")
-    public Collection<Identifier> getIdentifiers() {
+    public synchronized Collection<Identifier> getIdentifiers() {
         identifiers = nonNullCollection(identifiers, Identifier.class);
         return filterIdentifiers(identifiers);
     }

Modified: 
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java?rev=1459835&r1=1459834&r2=1459835&view=diff
==============================================================================
--- 
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
 [UTF-8] Fri Mar 22 15:12:02 2013
@@ -47,7 +47,6 @@ import org.apache.sis.metadata.iso.citat
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static java.util.Collections.singleton;