[Firebird-checkins] SF.net SVN: firebird:[61971] firebird/trunk

[<asf...@us...>]

Revision: 61971
          http://sourceforge.net/p/firebird/code/61971
Author:   asfernandes
Date:     2015-07-12 20:10:49 +0000 (Sun, 12 Jul 2015)
Log Message:
-----------
Misc.

Modified Paths:
--------------
    firebird/trunk/builds/install/misc/firebird.conf.in
    firebird/trunk/src/common/config/config.cpp
    firebird/trunk/src/jrd/trace/TraceManager.cpp

Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in	2015-07-12 17:54:11 UTC (rev 61970)
+++ firebird/trunk/builds/install/misc/firebird.conf.in	2015-07-12 20:10:49 UTC (rev 61971)
@@ -870,18 +870,18 @@
 # ============================
 
 #
-# Control a method firebird engine is using to work with databases and
-# related firebird server startup parameters.
+# Controls the method Firebird engine uses to work with databases and
+# related Firebird server startup parameters.
 #
 # The values are:
 # Super / ThreadedDedicated - databases are opened exclusive by single server process,
 #	attachments share single DB pages cache inside process
 # SuperClassic / ThreadedShared - databases are opened by single server process,
 #	but it does not prevent opening them in other processes (embedded access),
-#	each attachment has it's own DB pages cache
-# Classic / MultiProcess - for each attachment to server separate process is started,
-#	each database mauy be opened by mu;tiple processes (including local ones for
-#	embedded access), each attachment (process) has it's own DB pages cache
+#	each attachment has its own DB pages cache
+# Classic / MultiProcess - for each attachment to server a separate process is started,
+#	each database may be opened by multiple processes (including local ones for
+#	embedded access), each attachment (process) has its own DB pages cache
 #
 # Type: string
 #

Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp	2015-07-12 17:54:11 UTC (rev 61970)
+++ firebird/trunk/src/common/config/config.cpp	2015-07-12 20:10:49 UTC (rev 61971)
@@ -686,6 +686,7 @@
 	const char* textMode = (const char*) (getDefaultConfig()->values[KEY_SERVER_MODE]);
 	const char* modes[6] =
 		{"Super", "ThreadedDedicated", "SuperClassic", "ThreadedShared", "Classic", "MultiProcess"};
+
 	for (int x = 0; x < 6; ++x)
 	{
 		if (fb_utils::stricmp(textMode, modes[x]) == 0)

Modified: firebird/trunk/src/jrd/trace/TraceManager.cpp
===================================================================
--- firebird/trunk/src/jrd/trace/TraceManager.cpp	2015-07-12 17:54:11 UTC (rev 61970)
+++ firebird/trunk/src/jrd/trace/TraceManager.cpp	2015-07-12 20:10:49 UTC (rev 61971)
@@ -230,6 +230,7 @@
 
 			string s_user = session.ses_user;
 			string t_role;
+
 			if (session.ses_auth.hasData())
 			{
 				Database* dbb = attachment->att_database;
@@ -242,11 +243,12 @@
 						dbb->dbb_config->getSecurityDatabase(),
 						dbb->dbb_provider->getCryptCallback());
 				}
-				catch(const Firebird::Exception&)
+				catch (const Firebird::Exception&)
 				{
 					// Error in mapUser() means missing context, therefore...
 					return;
 				}
+
 				t_role.upper();
 			}
 
@@ -260,6 +262,7 @@
 		{
 			string s_user = session.ses_user;
 			string t_role;
+
 			if (session.ses_auth.hasData())
 			{
 				PathName dummy;
@@ -271,11 +274,12 @@
 					mapUser(s_user, t_role, NULL, NULL, session.ses_auth, "services manager", NULL,
 						config->getSecurityDatabase(), service->getCryptCallback());
 				}
-				catch(const Firebird::Exception&)
+				catch (const Firebird::Exception&)
 				{
 					// Error in mapUser() means missing context, therefore...
 					return;
 				}
+
 				t_role.upper();
 			}
 

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