[cig-commits] r6214 - in long/3D/Gale/trunk: . src/StGermain/Base/Extensibility/src

[walter at geodynamics.org]

Author: walter
Date: 2007-03-09 13:34:12 -0800 (Fri, 09 Mar 2007)
New Revision: 6214

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c
Log:
 r1679 at earth:  boo | 2007-03-09 13:33:22 -0800
 Make shared stuff work if pluginDirectories==NULL



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1678
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1679

Modified: long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c	2007-03-09 21:34:09 UTC (rev 6213)
+++ long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c	2007-03-09 21:34:12 UTC (rev 6214)
@@ -182,7 +182,7 @@
 	/* Print parent */
 	_Stg_Class_Print( self, stream );
 
-	if ( pluginDirectories->count > 0 ) {
+	if ( pluginDirectories!=NULL && pluginDirectories->count > 0 ) {
 		Journal_Printf( stream, "Search Path:\n" );
 		Stream_Indent( stream );
 		for ( i = 0; i < pluginDirectories->count; ++i ) {
@@ -238,11 +238,12 @@
 	SingleRegister( context );
 #else
 #ifndef NOSHARED
-	for ( dir_I = 0; dir_I < pluginDirectories->count; ++dir_I ) {
-		newEnvPathLength += strlen( Stg_ObjectList_ObjectAt( pluginDirectories, dir_I ) );
-		/* Add one make space for the ':' inbetween the directories */
-		newEnvPathLength += 1; 
-	}
+        if(pluginDirectories!=NULL)
+          for ( dir_I = 0; dir_I < pluginDirectories->count; ++dir_I ) {
+            newEnvPathLength += strlen( Stg_ObjectList_ObjectAt( pluginDirectories, dir_I ) );
+            /* Add one make space for the ':' inbetween the directories */
+            newEnvPathLength += 1; 
+          }
 	curEnvPath = getenv("LD_LIBRARY_PATH");
 	if ( curEnvPath ) {
 		newEnvPathLength += strlen( curEnvPath );