diff options
Diffstat (limited to 'auth/auth-core/src/main')
| -rw-r--r-- | auth/auth-core/src/main/java/org/onap/aaf/auth/local/TextIndex.java | 10 | ||||
| -rw-r--r-- | auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/local/TextIndex.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/local/TextIndex.java index cbb3603e..4cf2dd5d 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/local/TextIndex.java +++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/local/TextIndex.java @@ -132,12 +132,8 @@ public class TextIndex { TimeTaken tt2 = trans.start("Open Files", Env.SUB); try { raf = new RandomAccessFile(file,"rw"); - try { - raf.setLength(0L); - fos = raf.getChannel(); - } finally { - raf.close(); - } + raf.setLength(0L); + fos = raf.getChannel(); } finally { tt2.done(); } @@ -187,7 +183,7 @@ public class TextIndex { } } finally { fos.close(); - raf.close(); + raf.close(); // closed by fos } } diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java index d12345a9..843e2682 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java +++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java @@ -75,6 +75,8 @@ public class OrganizationFactory { } Organization org = orgs.get(orgNS); if(org == null) { + env.debug().printf("Attempting to instantiate Organization %s\n",orgNS); + String orgClass = env.getProperty(ORGANIZATION_DOT+orgNS); if(orgClass == null) { env.warn().log("There is no Organization." + orgNS + " property"); @@ -104,10 +106,11 @@ public class OrganizationFactory { } } orgs.put(orgNS, org); - if("true".equalsIgnoreCase(env.getProperty(orgNS+".default"))) { + boolean isDefault; + if((isDefault="true".equalsIgnoreCase(env.getProperty(orgNS+".default")))) { defaultOrg = org; } - + env.init().printf("Instantiated %s with %s%s\n",orgNS,orgClass,(isDefault?" as default":"")); } if(org==null) { if(defaultOrg!=null) { |