diff --git a/GSWeb.framework/GSWDefaultAdaptorThread.m b/GSWeb.framework/GSWDefaultAdaptorThread.m index ce37aaf..d6a2d59 100644 --- a/GSWeb.framework/GSWDefaultAdaptorThread.m +++ b/GSWeb.framework/GSWDefaultAdaptorThread.m @@ -585,7 +585,7 @@ RCS_ID("$Id$") NSString* method=[requestLineArray objectAtIndex:0]; NSString* url=[requestLineArray objectAtIndex:1]; NSArray* http=[[requestLineArray objectAtIndex:2] componentsSeparatedByString:@"/"]; - [GSWApplication statusLogWithFormat:@"Request uri=%@",url]; + [GSWApplication statusLogWithFormat:@"RemoteAddress=%@ Request uri=%@",_remoteAddress,url]; NSDebugDeepMLLog(@"info",@"method=%@",method); NSDebugDeepMLLog(@"info",@"url=%@",url); diff --git a/GSWeb.framework/GSWDeployedBundle.m b/GSWeb.framework/GSWDeployedBundle.m index bf757ef..f329668 100644 --- a/GSWeb.framework/GSWDeployedBundle.m +++ b/GSWeb.framework/GSWDeployedBundle.m @@ -390,7 +390,7 @@ RCS_ID("$Id$") //NSDebugMLLog(@"bundles",@"_path=%@",_path); if (path==GSNotFoundMarker) path=nil; - if (!path) + else if (!path) { //call again _relativePathForResourceNamed:inDirectory:forLanguage: NSString* completePathTest=nil; @@ -420,7 +420,7 @@ RCS_ID("$Id$") else [_relativePathsCache setObject:GSNotFoundMarker forKeysArray:keys]; - }; + } } NS_HANDLER { diff --git a/GSWeb.framework/GSWDirectAction.m b/GSWeb.framework/GSWDirectAction.m index 15464ff..3a77670 100644 --- a/GSWeb.framework/GSWDirectAction.m +++ b/GSWeb.framework/GSWDirectAction.m @@ -43,7 +43,7 @@ RCS_ID("$Id$") LOGObjectFnStart(); if ((self=[super init])) { - _context=[GSWContext contextWithRequest:aRequest]; + _context=[[GSWApplication application]createContextForRequest:aRequest]; [GSWApp _setContext:_context]; //NDFN [self _initializeRequestSessionIDInContext:_context]; }; diff --git a/GSWeb.framework/GSWDynamicElement.h b/GSWeb.framework/GSWDynamicElement.h index 5de0f42..718c111 100644 --- a/GSWeb.framework/GSWDynamicElement.h +++ b/GSWeb.framework/GSWDynamicElement.h @@ -41,8 +41,6 @@ -(id)initWithName:(NSString*)name associations:(NSDictionary*)associations template:(GSWElement*)template; --(NSString*)definitionName; --(void)setDefinitionName:(NSString*)definitionName; @end //====================================================================