inosh
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor refactorings and fixing formatting issues

Browse Source
4.x.x
Dileesha Rajapakse 7 years ago
parent 6b4d11c1e4
commit 5b33f791ae
2 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File

22
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/ApplicationDAOImpl.java
Unescape View File

@ -26,8 +26,16 @@ import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
import java.io.*;
import java.sql.*; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.ObjectInputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
@ -84,14 +92,14 @@ public class ApplicationDAOImpl implements ApplicationDAO {
try { try {
bao.close(); bao.close();
} catch (IOException e) { } catch (IOException e) {
log.warn("Error occurred while closing ByteArrayOutputStream", e); log.error("Error occurred while closing ByteArrayOutputStream", e);
} }
} }
if (oos != null) { if (oos != null) {
try { try {
oos.close(); oos.close();
} catch (IOException e) { } catch (IOException e) {
log.warn("Error occurred while closing ObjectOutputStream", e); log.error("Error occurred while closing ObjectOutputStream", e);
} }
} }
DeviceManagementDAOUtil.cleanupResources(stmt, rs); DeviceManagementDAOUtil.cleanupResources(stmt, rs);
@ -150,14 +158,14 @@ public class ApplicationDAOImpl implements ApplicationDAO {
try { try {
bao.close(); bao.close();
} catch (IOException e) { } catch (IOException e) {
log.warn("Error occurred while closing ByteArrayOutputStream", e); log.error("Error occurred while closing ByteArrayOutputStream", e);
} }
} }
if (oos != null) { if (oos != null) {
try { try {
oos.close(); oos.close();
} catch (IOException e) { } catch (IOException e) {
log.warn("Error occurred while closing ObjectOutputStream", e); log.error("Error occurred while closing ObjectOutputStream", e);
} }
} }
DeviceManagementDAOUtil.cleanupResources(stmt, null); DeviceManagementDAOUtil.cleanupResources(stmt, null);
@ -193,7 +201,7 @@ public class ApplicationDAOImpl implements ApplicationDAO {
conn.rollback(); conn.rollback();
} }
} catch (SQLException e1) { } catch (SQLException e1) {
log.warn("Error occurred while roll-backing the transaction", e); log.error("Error occurred while roll-backing the transaction", e);
} }
throw new DeviceManagementDAOException("Error occurred while removing bulk application list", e); throw new DeviceManagementDAOException("Error occurred while removing bulk application list", e);
} finally { } finally {

Write Preview
Loading…
Cancel
Save