Skip to content

Commit fc93d3d

Browse files
committed
More thread safety improvements
1 parent e42c44b commit fc93d3d

9 files changed

Lines changed: 18 additions & 18 deletions

File tree

src/main/java/picoded/dstack/file/simple/FileSimple_FileWorkspaceMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class FileSimple_FileWorkspaceMap extends Core_FileWorkspaceMap {
2323
//--------------------------------------------------------------------------
2424

2525
/// The file directory to opreate from
26-
protected File baseDir = null;
26+
protected final File baseDir;
2727

2828
/// The file suffix to use for JSON object records
2929

src/main/java/picoded/dstack/hazelcast/core/HazelcastStack.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public abstract class HazelcastStack extends CoreStack {
2929
/**
3030
* The internal JSql connection
3131
*/
32-
protected HazelcastInstance conn = null;
32+
protected final HazelcastInstance conn;
3333

3434
/**
3535
* Constructor with configuration map

src/main/java/picoded/dstack/jsql/JSqlStack.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class JSqlStack extends CoreStack {
1515
/**
1616
* The internal JSql connection
1717
*/
18-
protected final JSql conn ;
18+
protected final JSql conn;
1919

2020
/**
2121
* Constructor with configuration map

src/main/java/picoded/dstack/mongodb/MongoDBStack.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ public class MongoDBStack extends CoreStack {
3333
/**
3434
* The internal MongoClient connection
3535
*/
36-
protected final MongoClient client_conn ;
37-
protected final MongoDatabase db_conn ;
36+
protected final MongoClient client_conn;
37+
protected final MongoDatabase db_conn;
3838

3939
/**
4040
* The secondary connetion settings
4141
*/
42-
protected final MongoClient sec_client_conn ;
43-
protected final MongoDatabase sec_db_conn ;
44-
protected final String sec_mode ;
42+
protected final MongoClient sec_client_conn;
43+
protected final MongoDatabase sec_db_conn;
44+
protected final String sec_mode;
4545

4646
//-------------------------------------------------------------------------
4747
// Connector utilities

src/main/java/picoded/dstack/redisson/RedissonStack.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class RedissonStack extends CoreStack {
2222
* The internal Redis connection
2323
*/
2424

25-
protected RedissonClient conn = null;
25+
protected final RedissonClient conn;
2626

2727
//-------------------------------------------------------------------------
2828
// Database connection constructor

src/main/java/picoded/dstack/struct/simple/StructSimple_DataObjectMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class StructSimple_DataObjectMap extends Core_DataObjectMap_struct {
3030
/**
3131
* Stores the key to value map
3232
**/
33-
protected Map<String, Map<String, Object>> valueMap = new ConcurrentHashMap<String, Map<String, Object>>();
33+
protected final Map<String, Map<String, Object>> valueMap = new ConcurrentHashMap<String, Map<String, Object>>();
3434

3535
/**
3636
* @return Storage map used centrally for all operations

src/main/java/picoded/dstack/struct/simple/StructSimple_FileWorkspaceMap.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
public class StructSimple_FileWorkspaceMap extends Core_FileWorkspaceMap {
1818

1919
// Stores all the various data for structSimple
20-
protected ConcurrentHashMap<String, ConcurrentHashMap<String, byte[]>> fileContentMap = new ConcurrentHashMap<String, ConcurrentHashMap<String, byte[]>>();
20+
protected final ConcurrentHashMap<String, ConcurrentHashMap<String, byte[]>> fileContentMap = new ConcurrentHashMap<String, ConcurrentHashMap<String, byte[]>>();
2121

2222
// Handles read / write locks
23-
protected ReentrantReadWriteLock accessLock = new ReentrantReadWriteLock();
23+
protected final ReentrantReadWriteLock accessLock = new ReentrantReadWriteLock();
2424

2525
//--------------------------------------------------------------------------
2626
//

src/main/java/picoded/dstack/struct/simple/StructSimple_KeyLongMap.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ public class StructSimple_KeyLongMap extends Core_KeyLongMap {
2020
/**
2121
* Stores the key to long map
2222
**/
23-
protected ConcurrentMap<String, Long> longMap = new ConcurrentHashMap<String, Long>();
23+
protected final ConcurrentMap<String, Long> longMap = new ConcurrentHashMap<String, Long>();
2424

2525
/**
2626
* Stores the expire timestamp
2727
**/
28-
protected ConcurrentMap<String, Long> expireMap = new ConcurrentHashMap<String, Long>();
28+
protected final ConcurrentMap<String, Long> expireMap = new ConcurrentHashMap<String, Long>();
2929

3030
/**
3131
* Read write lock
3232
**/
33-
protected ReentrantReadWriteLock accessLock = new ReentrantReadWriteLock();
33+
protected final ReentrantReadWriteLock accessLock = new ReentrantReadWriteLock();
3434

3535
//--------------------------------------------------------------------------
3636
//

src/main/java/picoded/dstack/struct/simple/StructSimple_KeyValueMap.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ public class StructSimple_KeyValueMap extends Core_KeyValueMap {
2929
/**
3030
* Stores the key to value map
3131
**/
32-
protected ConcurrentMap<String, String> valueMap = new ConcurrentHashMap<String, String>();
32+
protected final ConcurrentMap<String, String> valueMap = new ConcurrentHashMap<String, String>();
3333

3434
/**
3535
* Stores the expire timestamp
3636
**/
37-
protected ConcurrentMap<String, Long> expireMap = new ConcurrentHashMap<String, Long>();
37+
protected final ConcurrentMap<String, Long> expireMap = new ConcurrentHashMap<String, Long>();
3838

3939
/**
4040
* Read write lock
4141
**/
42-
protected ReentrantReadWriteLock accessLock = new ReentrantReadWriteLock();
42+
protected final ReentrantReadWriteLock accessLock = new ReentrantReadWriteLock();
4343

4444
//--------------------------------------------------------------------------
4545
//

0 commit comments

Comments
 (0)