Merged V4.0-BUG-FIX to HEAD

33757: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX
      33755: Latest Spring Surf libs:
             - Updates to convert FreeMarker directives for processing directives Spring Beans to allow their behaviour to be customized.
             - Changed Extensibility model objects to use a non-blocking GUID generator to avoid thread contention (small amount noticed with 1000 concurrent user test)
             - Removed old machine gun code to generate Object GUIDs, which weren't even valid GUIDs ironically.
             - Replaced with new non-blocking fast GUID generator in webscripts package.
             - Added Reentrant ReadWriteLock around resources in singleton Spring beans that are manipulated by multiple threads.
             - Added Reentrant ReadWriteLock around Advanced Component internal resources.
             - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
             - Removed lock around ModelWriter (which is only used by a single request thread at a time)
             - Replaced StringBuffer with StringBuilder for Writer usage in extensibility framework to remove locking.
             - Performance improvements around retrieval of RemoteClient instance
             - avoid expensive Spring prototype bean retrieval, use a threadlocal clone of a base RemoteClient bean instead.
             - Concurrency fixes around CRUD operations on shared ModelObjects instances.
             - Surf ModelObjects are shared between all users in the model object caches - but the original machine gun code has no locking what-so-ever around CRUD operations - which meant that it was possible for incorrect property values to be received from a ModelObject in a heavily multi-threaded scenario on initialisation of a Surf application.
             - was causing nonsense warnings such as:
               WARN  [extensions.webscripts.WebTemplateProcessor] [http-8081-exec-10] Unable to find a valid template path for uri: freemarker
             - Modified default web-tier server response codes for read timeout and connect timeout to return more sensible codes to client browsers.
             - Fix for concurrency issue resolving SpringMVC View objects found during heavy thread testing on web-tier startup.
             - Improved caching strategy for WebScripts View Resolver - move techniques from Surf down to WebScripts layer.
             - Improved general View Resolver strategy by caching failed view requests.
             - WebScript resource bundle extension module application thread safety modifications   
   Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      33684: Fixes for ALF-12628, ALF-12639 - timeout handling for READ_TIMEOUT from web-tier to Alfresco
   33771: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled
   33773: ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang
   - filter to include only updateable properties at persistence and start up time
   33775: ALF-11870 Handle the odd way that Outlook requests yearly repeating events, and add unit tests for the yearly recurrence cases
   33776: ALF-12569: org.postgresql.util.PSQLException Invalid ESCAPE on customizing alfresco share site dashboard   
      Added backwards compatible PostgreSQL-specific ESCAPE fragment - fixes for PostgreSQL 9.1.2.
   33784: Fixes: ALF-12111 - Publishing Error when authenticating Facebook channels using IE8. Required an update to stand-alone-auth-return.html.
   33787: Fix for ALF-12337 Remove patch.siteLoadPatch.swsdp from being run for upgrades
   - only add the sample site for new installs and not upgrades
   33794: ITALIAN: Translation updates based on EN r33523
   33807: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33717: (RECORD ONLY) ALF-12632 Move the Site Service permissions to public-services-security-context.xml, to mirror the behaviour on 4.0, and add a (commented out) example of how to restrict site creation permissions with it
      33806: Merged V3.4 to V3.4-BUG-FIX
         33728: ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews.
            - Added configuration to limit older excel format 'xls' from Excel 5.0/95 and Excel 97-2003
              Already had configuration for xlsx Microsoft Office 2007
         33743: ALF-12724: Merge HEAD to V3.4 (3.4.8)
            Issue found while fixing ALF-9899 and again by QA when testing ALF-9899
            32941: ALF-11300:
              - fix locking issues
         33772: Merged DEV to V3.4
            33768: ALF-12685 : Search isn't working correctly
               Index delete events were not getting fired for the entire tree of affected nodes when a node was archive
               Added a deletion of child nodes from indexes in DbNodeServiceImpl.pullNodeChildrenToSameStore() method.
         33803: ALF-12724: Merged V4.0-BUG-FIX to V3.4 (Reverts previous revision and changes an error message to debug)
            33137: Activities feed generator: change info log messages to debug log messages
            33452: Fix for ALF-12536
            33536: Fix for ALF-12536: hopefully this will be the final fix.
         33805: ALF-12624: Fix regression introduced by ALF-9514


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/filesys/repo/LegacyFileStateDriver.java

@@ -37,6 +37,7 @@ import org.alfresco.jlan.server.filesys.TreeConnection;
 import org.alfresco.jlan.server.filesys.cache.FileState;
 import org.alfresco.jlan.server.filesys.cache.FileStateCache;
 import org.alfresco.jlan.server.filesys.cache.NetworkFileStateInterface;
+import org.alfresco.jlan.server.filesys.pseudo.PseudoFile;
 import org.alfresco.jlan.smb.SharingMode;
 import org.alfresco.model.ContentModel;
 import org.alfresco.util.PropertyCheck;
@@ -99,6 +100,8 @@ public class LegacyFileStateDriver implements ExtendedDiskInterface
         try
         {
             NetworkFile newFile = diskInterface.createFile(sess, tree, params);
+            
+            newFile.setAccessToken(token);
           
             if(tctx.hasStateCache())
             {
@@ -194,68 +197,64 @@ public class LegacyFileStateDriver implements ExtendedDiskInterface
         try
         {
             NetworkFile openFile = diskInterface.openFile(sess, tree, params);
-
+            
+            openFile.setAccessToken(token);
+            
+            FileState fstate = null;
+            
+            if(tctx.hasStateCache())
+            {
+                fstate = tctx.getStateCache().findFileState( path, true);
+                fstate.setProcessId(params.getProcessId());
+                fstate.setSharedAccess( params.getSharedAccess());
+                
+                // Access date time is read/write time not open time
+                // fstate.updateAccessDateTime();
+                
+                fstate.setFileSize(openFile.getFileSize());
+                fstate.updateChangeDateTime(openFile.getModifyDate());
+                fstate.updateModifyDateTime(openFile.getModifyDate());
+            }
+            
             if (openFile instanceof ContentNetworkFile)
             {
                 ContentNetworkFile x = (ContentNetworkFile)openFile;
                 x.setProcessId( params.getProcessId());
-                x.setAccessToken(token);
-                if(tctx.hasStateCache())
-                {
-                    FileState fstate = tctx.getStateCache().findFileState( path, true);
-                    x.setFileState(fstate);
-                    fstate.setProcessId(params.getProcessId());
-                    fstate.setSharedAccess( params.getSharedAccess());
-                    fstate.setFileStatus(FileStatus.FileExists);
-                    // Access date time is read/write time not open time
-                    // fstate.updateAccessDateTime();
-                    
-                    fstate.setFileSize(x.getFileSize());
-                    fstate.updateChangeDateTime(x.getModifyDate());
-                    fstate.updateModifyDateTime(x.getModifyDate());
-                }
-            }
 
-            if (openFile instanceof TempNetworkFile)
+                if(fstate != null)
+                {
+                    x.setFileState(fstate);
+                    fstate.setFileStatus(FileStatus.FileExists);
+                }
+            } 
+            else if (openFile instanceof TempNetworkFile)
             {
                 TempNetworkFile x = (TempNetworkFile)openFile;
-                x.setAccessToken(token);
-                // x.setProcessId( params.getProcessId());
-                if(tctx.hasStateCache())
+                if(fstate != null)
                 {
-                    FileState fstate = tctx.getStateCache().findFileState( path, true);
                     x.setFileState(fstate);
                     fstate.setFileStatus(FileStatus.FileExists);
-                    fstate.setProcessId(params.getProcessId());
-                    fstate.setSharedAccess( params.getSharedAccess());
-                    // access date time is read/write time not open time
-                    //fstate.updateAccessDateTime();
-                    
-                    fstate.setFileSize(x.getFileSize());
-                    fstate.updateChangeDateTime(x.getModifyDate());
-                    fstate.updateModifyDateTime(x.getModifyDate());
                 }
             }
-
-            if (openFile instanceof AlfrescoFolder)
+            else if (openFile instanceof AlfrescoFolder)
             {
                 AlfrescoFolder x = (AlfrescoFolder)openFile;
-                //x.setProcessId( param.getProcessId());
-                if(tctx.hasStateCache())
+                if(fstate != null)
                 {
-                    FileState fstate = tctx.getStateCache().findFileState( path, true);
                     x.setFileState(fstate);
                     fstate.setFileStatus(FileStatus.DirectoryExists);
-                    fstate.setProcessId(params.getProcessId());
-                    fstate.setSharedAccess( params.getSharedAccess());
-                    // Access date time is read/write time not open time
-                    //fstate.updateAccessDateTime();
-                    
-                    fstate.setFileSize(x.getFileSize());
-                    fstate.updateChangeDateTime(x.getModifyDate());
-                    fstate.updateModifyDateTime(x.getModifyDate());
                 }
             }
+            else if (openFile instanceof NetworkFile)
+            {
+                NetworkFile x = (NetworkFile)openFile;
+                if(fstate != null)
+                {
+                    // NetworkFile does not have setFileState
+                    //x.setFileState(fstate);
+                    fstate.setFileStatus(FileStatus.FileExists);
+                }           
+            }
 
             return openFile;
         }