Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 14:49:53 +01:00
Code Issues Projects Releases Wiki Activity

All tryToClose() methods should check for null arguments.

Browse Source
This commit is contained in:
akwizgran
2014-04-04 18:56:55 +01:00
parent 75f13f53a0
commit e260aac3d2
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
View File

@@ -209,6 +209,10 @@ class DroidtoothPlugin implements DuplexPlugin {
tryToClose(socket); tryToClose(socket);
return; return;
} }
if(LOG.isLoggable(INFO)) {
String address = s.getRemoteDevice().getAddress();
LOG.info("Connection from " + address);
}
callback.incomingConnectionCreated(wrapSocket(s)); callback.incomingConnectionCreated(wrapSocket(s));
} }
} }

8
briar-core/src/org/briarproject/db/JdbcDatabase.java
View File

@@ -404,16 +404,16 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
private void tryToClose(ResultSet rs) { private void tryToClose(ResultSet rs) {
if(rs != null) try { try {
rs.close(); if(rs != null) rs.close();
} catch(SQLException e) { } catch(SQLException e) {
if(LOG.isLoggable(WARNING))LOG.log(WARNING, e.toString(), e); if(LOG.isLoggable(WARNING))LOG.log(WARNING, e.toString(), e);
} }
} }
private void tryToClose(Statement s) { private void tryToClose(Statement s) {
if(s != null) try { try {
s.close(); if(s != null) s.close();
} catch(SQLException e) { } catch(SQLException e) {
if(LOG.isLoggable(WARNING))LOG.log(WARNING, e.toString(), e); if(LOG.isLoggable(WARNING))LOG.log(WARNING, e.toString(), e);
} }

2
briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
View File

@@ -339,7 +339,7 @@ class BluetoothPlugin implements DuplexPlugin {
private void tryToClose(StreamConnection s) { private void tryToClose(StreamConnection s) {
try { try {
s.close(); if(s != null) s.close();
} catch(IOException e) { } catch(IOException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e); if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
} }

2
briar-desktop/src/org/briarproject/plugins/modem/ModemImpl.java
View File

@@ -114,7 +114,7 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
private void tryToClose(SerialPort port) { private void tryToClose(SerialPort port) {
try { try {
port.closePort(); if(port != null) port.closePort();
} catch(IOException e) { } catch(IOException e) {
if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e); if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
} }