synchronized access to encoder/decoder

jyemin · jyemin · commit f4a2601ddd93 · 2012-01-23T11:18:40.000-05:00
diff --git a/src/main/com/mongodb/DBCollection.java b/src/main/com/mongodb/DBCollection.java
@@ -655,13 +655,13 @@ public final DBObject findOne( DBObject o, DBObject fields, ReadPreference readP
     // Only create a new decoder if there is a decoder factory explicitly set on the collection.  Otherwise return null
     // so that DBPort will use a cached decoder from the default factory.
     private DBDecoder getDecoder() {
-        return _decoderFactory != null ? _decoderFactory.create() : null;
+        return getDBDecoderFactory() != null ? getDBDecoderFactory().create() : null;
     }
 
     // Only create a new encoder if there is an encoder factory explicitly set on the collection.  Otherwise return null
     // to allow DB to create its own or use a cached one.
     private DBEncoder getDBEncoder() {
-        return _encoderFactory != null ? _encoderFactory.create() : null;
+        return getDBEncoderFactory() != null ? getDBEncoderFactory().create() : null;
     }
 
 
@@ -1429,7 +1429,7 @@ public int getOptions(){
      * Set a customer decoder factory for this collection.  Set to null to use the default from MongoOptions.
      * @param fact  the factory to set.
      */
-    public void setDBDecoderFactory(DBDecoderFactory fact) {
+    public synchronized void setDBDecoderFactory(DBDecoderFactory fact) {
         _decoderFactory = fact;
     }
 
@@ -1438,15 +1438,15 @@ public void setDBDecoderFactory(DBDecoderFactory fact) {
      * is being used.
      * @return  the factory
      */
-    public DBDecoderFactory getDBDecoderFactory() {
+    public synchronized DBDecoderFactory getDBDecoderFactory() {
         return _decoderFactory;
     }
 
     /**
      * Set a customer encoder factory for this collection.  Set to null to use the default from MongoOptions.
      * @param fact  the factory to set.
      */
-    public void setDBEncoderFactory(DBEncoderFactory fact) {
+    public synchronized void setDBEncoderFactory(DBEncoderFactory fact) {
         _encoderFactory = fact;
     }
 
@@ -1455,7 +1455,7 @@ public void setDBEncoderFactory(DBEncoderFactory fact) {
      * is being used.
      * @return  the factory
      */
-    public DBEncoderFactory getDBEncoderFactory() {
+    public synchronized DBEncoderFactory getDBEncoderFactory() {
         return _encoderFactory;
     }
 
