[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/util FileWrapperImpl.java, 1.2
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2008-12-30 12:08:13
|
Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3084/fw/src/net/sourceforge/squirrel_sql/fw/util Modified Files: FileWrapperImpl.java Log Message: Fixed potential NPE identified by findbugs. Index: FileWrapperImpl.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/FileWrapperImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileWrapperImpl.java 25 Dec 2008 19:09:30 -0000 1.2 --- FileWrapperImpl.java 30 Dec 2008 11:33:36 -0000 1.3 *************** *** 527,532 **** throws IOException { ! return new FileWrapperImpl(File.createTempFile(prefix, suffix, ! ((FileWrapperImpl) directory)._wrappedFile)); } --- 527,536 ---- throws IOException { ! if (directory == null) { ! return new FileWrapperImpl(File.createTempFile(prefix, suffix, null)); ! } else { ! return new FileWrapperImpl(File.createTempFile(prefix, suffix, ! ((FileWrapperImpl) directory)._wrappedFile)); ! } } *************** *** 579,587 **** /** ! * @see net.sourceforge.squirrel_sql.fw.util.FileWrapper#equals(java.lang.Object) */ ! public boolean equals(Object obj) { ! return _wrappedFile.equals(obj); } --- 583,592 ---- /** ! * @see net.sourceforge.squirrel_sql.fw.util.FileWrapper#toString() */ ! @Override ! public String toString() { ! return _wrappedFile.toString(); } *************** *** 589,603 **** * @see net.sourceforge.squirrel_sql.fw.util.FileWrapper#hashCode() */ public int hashCode() { ! return _wrappedFile.hashCode(); } /** ! * @see net.sourceforge.squirrel_sql.fw.util.FileWrapper#toString() */ ! public String toString() { ! return _wrappedFile.toString(); } --- 594,622 ---- * @see net.sourceforge.squirrel_sql.fw.util.FileWrapper#hashCode() */ + @Override public int hashCode() { ! final int prime = 31; ! int result = 1; ! result = prime * result + ((_wrappedFile == null) ? 0 : _wrappedFile.hashCode()); ! return result; } /** ! * @see net.sourceforge.squirrel_sql.fw.util.FileWrapper#equals(java.lang.Object) */ ! @Override ! public boolean equals(Object obj) { ! if (this == obj) { return true; } ! if (obj == null) { return false; } ! if (getClass() != obj.getClass()) { return false; } ! FileWrapperImpl other = (FileWrapperImpl) obj; ! if (_wrappedFile == null) ! { ! if (other._wrappedFile != null) { return false; } ! } ! else if (!_wrappedFile.equals(other._wrappedFile)) { return false; } ! return true; } *************** *** 615,619 **** * separator. */ ! private synchronized void readObject(java.io.ObjectInputStream s) throws IOException, ClassNotFoundException { --- 634,638 ---- * separator. */ ! private void readObject(java.io.ObjectInputStream s) throws IOException, ClassNotFoundException { |