[Firebird-checkins] SF.net SVN: firebird:[57868] firebird/branches/B2_5_Release/src/jrd/jrd.cpp

[<di...@us...>]

Revision: 57868
          http://sourceforge.net/p/firebird/code/57868
Author:   dimitr
Date:     2013-03-29 12:11:56 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
Fixed the error I introduced recently.

Modified Paths:
--------------
    firebird/branches/B2_5_Release/src/jrd/jrd.cpp

Modified: firebird/branches/B2_5_Release/src/jrd/jrd.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/jrd.cpp	2013-03-29 07:39:15 UTC (rev 57867)
+++ firebird/branches/B2_5_Release/src/jrd/jrd.cpp	2013-03-29 12:11:56 UTC (rev 57868)
@@ -6391,10 +6391,9 @@
 
 		if (options.dpb_user_name.hasData() || (id == -1))
 		{
-			name = options.dpb_user_name;
-
-			if (name.hasData())
+			if (name.empty() && options.dpb_user_name.hasData())
 			{
+				name = options.dpb_user_name;
 				ISC_utf8ToSystem(name);
 				name.upper();
 				ISC_systemToUtf8(name);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.