tn5250j/src/org/tn5250j SessionConfig.java,1.11,1.12

[email protected]
Newsgroups gmane.comp.java.tn5250j.cvs
Message-ID <[email protected]>
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j
In directory sc8-pr-cvs1:/tmp/cvs-serv1170/src/org/tn5250j

Modified Files:
	SessionConfig.java 
Log Message:
Fix for bug [ 820893 ] Session Attributes won't save in 0.5.7pre2

Index: SessionConfig.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/SessionConfig.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SessionConfig.java	20 Aug 2003 09:59:36 -0000	1.11
--- SessionConfig.java	3 Dec 2003 10:54:20 -0000	1.12
***************
*** 178,202 ****
        sesProps = new Properties();
  
!       try {
!          FileInputStream in = new FileInputStream(settingsDirectory() + getConfigurationResource());
!          sesProps.load(in);
!          if (sesProps.size() == 0)
!             loadDefaults();
!       }
!       catch (IOException ioe) {
!          System.out.println("Information Message: Properties file is being "
!                               + "created for first time use:  File name "
!                               + getConfigurationResource());
           loadDefaults();
        }
!       catch (SecurityException se) {
!          System.out.println(se.getMessage());
        }
- 
     }
!    
     private String settingsDirectory() {
         if (System.getProperties().containsKey("emulator.settingsDirectory")) {
!            return System.getProperty("emulator.settingsDirectory") +  
             File.separator;
         }
--- 178,208 ----
        sesProps = new Properties();
  
!       if (configurationResource == null || configurationResource == "") {
!          configurationResource = "TN5250JDefaults.props";
!          usingDefaults = true;
           loadDefaults();
        }
!       else {
!          try {
!             FileInputStream in = new FileInputStream(settingsDirectory() + getConfigurationResource());
!             sesProps.load(in);
!             if (sesProps.size() == 0)
!                loadDefaults();
!          }
!          catch (IOException ioe) {
!             System.out.println("Information Message: Properties file is being "
!                                  + "created for first time use:  File name "
!                                  + getConfigurationResource());
!             loadDefaults();
!          }
!          catch (SecurityException se) {
!             System.out.println(se.getMessage());
!          }
        }
     }
! 
     private String settingsDirectory() {
         if (System.getProperties().containsKey("emulator.settingsDirectory")) {
!            return System.getProperty("emulator.settingsDirectory") +
             File.separator;
         }




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.