fixed close of auditing config file input stream for allow move of files
/**
* Copyright 2010-2016 OrientDB LTD (http://orientdb.com)
* <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
* <p>
* For more information: http://www.orientdb.com
*/
@@ -131,7 +128,7 @@ public class ODefaultAuditing implements OAuditingService, ODatabaseLifecycleLis
} else {
final InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream(DEFAULT_FILE_AUDITING_DB_CONFIG);
-
+ try {
if (resourceAsStream == null)
OLogManager.instance().error(this, "defaultHook() resourceAsStream is null", null);
@@ -153,6 +150,14 @@ public class ODefaultAuditing implements OAuditingService, ODatabaseLifecycleLis
OLogManager.instance().error(this, "Cannot save auditing file configuration", e);
}
}
+ } finally {
+ try {
+ if (resourceAsStream != null)
+ resourceAsStream.close();
+ } catch (IOException e) {
+ OLogManager.instance().error(this, "Cannot read auditing file configuration", e);
+ }
+ }
}
final ODocument cfg = new ODocument().fromJSON(content, "noMap");
return new OAuditingHook(cfg, server);
@@ -171,6 +176,14 @@ public class ODefaultAuditing implements OAuditingService, ODatabaseLifecycleLis
} catch (Exception e) {
content = "{}";
OLogManager.instance().error(this, "Cannot get auditing file configuration", e);
+ } finally {
+ if (f != null) {
+ try {
+ f.close();
+ } catch (IOException e) {
+ OLogManager.instance().error(this, "Cannot get auditing file configuration", e);
+ }
+ }
}
return content;
}
