[sword-svn] r1915 - trunk/bindings/corba/java/src/org/crosswire/sword/orb

[scribe at crosswire.org]

Author: scribe
Date: 2006-05-11 23:54:47 -0700 (Thu, 11 May 2006)
New Revision: 1915

Modified:
   trunk/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java
Log:
Fixed a bug with tripwires during locale save/restore.


Modified: trunk/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java
===================================================================
--- trunk/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java	2006-05-12 06:16:12 UTC (rev 1914)
+++ trunk/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java	2006-05-12 06:54:47 UTC (rev 1915)
@@ -159,10 +159,6 @@
 		if (orb == null) {
 System.out.println("No ORB found in session; constructing a new instance");
 
-			String locName = (String)session.getAttribute("SwordOrbLocale");
-			if (locName != null)
-				orb.localeName = locName;
-
 			Vector orbs = (Vector)clients.get(remoteAddr);
 			if (orbs == null) {
 				orbs = new Vector();
@@ -171,6 +167,11 @@
 			if (orbs.size() < MAX_REMOTE_ADDR_CONNECTIONS) {
 				orb = new SwordOrb(remoteAddr);
 				orbs.add(orb);
+
+				String locName = (String)session.getAttribute("SwordOrbLocale");
+				if (locName != null)
+					orb.localeName = locName;
+
 				session.setAttribute("SwordOrb", orb);
 			}
 			else throw new Exception("Max Remote Addr Connections from: ["+remoteAddr+"]");