summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian S. O'Neill <bronee@gmail.com>2007-02-05 21:44:30 +0000
committerBrian S. O'Neill <bronee@gmail.com>2007-02-05 21:44:30 +0000
commit18fb999087a4ebe38420d28dee478ac2b24e44a9 (patch)
treeca0f2cb6c35c518e509732af87d7e11be26adb43 /src
parenta128380ad3a2c722506675ec2d119877e5d0ebcb (diff)
Fix NPE in builder.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/amazon/carbonado/repo/logging/LoggingRepositoryBuilder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/amazon/carbonado/repo/logging/LoggingRepositoryBuilder.java b/src/main/java/com/amazon/carbonado/repo/logging/LoggingRepositoryBuilder.java
index 98c1008..3909eb1 100644
--- a/src/main/java/com/amazon/carbonado/repo/logging/LoggingRepositoryBuilder.java
+++ b/src/main/java/com/amazon/carbonado/repo/logging/LoggingRepositoryBuilder.java
@@ -116,7 +116,8 @@ public class LoggingRepositoryBuilder extends AbstractRepositoryBuilder {
}
public boolean isMaster() {
- return mMaster;
+ return mMaster != null ? mMaster
+ : (mRepoBuilder != null ? mRepoBuilder.isMaster() : false);
}
/**