Skip to content

Commit 8fffadc

Browse files
authored
Merge pull request #5 from eagletalon139/master
Fixing issue where an NPE would occur if a authDescriptor was sent in…
2 parents a5362c8 + 87ede71 commit 8fffadc

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/main/java/net/spy/memcached/MemcachedClient.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -283,19 +283,19 @@ private MemcachedClient(ConnectionFactory cf, List<InetSocketAddress> addrs, boo
283283
transcoder = cf.getDefaultTranscoder();
284284
opFact = cf.getOperationFactory();
285285
assert opFact != null : "Connection factory failed to make op factory";
286-
286+
287+
if(clientMode == ClientMode.Dynamic){
288+
initializeClientUsingConfigEndPoint(cf, addrs.get(0));
289+
} else {
290+
setupConnection(cf, addrs);
291+
}
292+
287293
operationTimeout = cf.getOperationTimeout();
288294
authDescriptor = cf.getAuthDescriptor();
289295
executorService = cf.getListenerExecutorService();
290296
if (authDescriptor != null) {
291297
addObserver(this);
292298
}
293-
294-
if(clientMode == ClientMode.Dynamic){
295-
initializeClientUsingConfigEndPoint(cf, addrs.get(0));
296-
} else {
297-
setupConnection(cf, addrs);
298-
}
299299
}
300300

301301
/**

0 commit comments

Comments
 (0)