From: Pierre-Luc P. <pa...@us...> - 2002-11-23 18:27:44
|
Update of /cvsroot/gallery/gallery_remote/com/gallery/GalleryRemote In directory sc8-pr-cvs1:/tmp/cvs-serv28221/com/gallery/GalleryRemote Modified Files: MainFrame.java Log Message: Fixed possible NPE when shutting down. Index: MainFrame.java =================================================================== RCS file: /cvsroot/gallery/gallery_remote/com/gallery/GalleryRemote/MainFrame.java,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- MainFrame.java 22 Nov 2002 00:57:54 -0000 1.45 +++ MainFrame.java 23 Nov 2002 18:27:41 -0000 1.46 @@ -193,14 +193,18 @@ PropertiesFile p = GalleryRemote.getInstance().properties; for (int i = 0; i < galleries.getSize(); i++) { Gallery g = (Gallery) galleries.getElementAt(i); - p.setProperty( "url." + i, g.getUrlString() ); - if (g.getUsername() != null) { - p.setProperty( "username." + i, g.getUsername() ); - } - - if (p.getBooleanProperty("savePasswords") && g.getPassword() != null) { - p.setBase64Property( "password." + i, g.getPassword() ); + String url = g.getUrlString(); + if ( url != null) { + p.setProperty( "url." + i, url ); + + if (g.getUsername() != null) { + p.setProperty( "username." + i, g.getUsername() ); + } + + if (p.getBooleanProperty("savePasswords") && g.getPassword() != null) { + p.setBase64Property( "password." + i, g.getPassword() ); + } } } |