Merge after backout of changeset 017ec8d2e32f

diff --cc src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
index 73fdae9,60b7101..d81de62
--- 1/src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
--- 2/src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
+++ b/src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
@@@ -851,14 -829,14 +832,14 @@@ public class ExternalAPIBean implement
                // Use the lastElement to retrieve the actual resource.
                Object resource = null;
                try {
-                       FileHeaderDTO file = getFile(cursor==null ? rootFolderId : cursor.getId(), lastElement);
 -                      FileHeader file = getFile(cursorId, lastElement);
++                      FileHeader file = getFile(cursor==null ? rootFolderId : cursor.getId(), lastElement);
                        if (ignoreDeleted && file.isDeleted())
                                throw new ObjectNotFoundException("Resource not found");
                        resource = file;
                } catch (ObjectNotFoundException e) {
                        // Perhaps the requested resource is not a file, so
                        // check for folders as well.
-                       FolderDTO folder = getFolder(cursor==null ? rootFolderId : cursor.getId(), lastElement).getDTO();
 -                      Folder folder = getFolder(cursorId, lastElement);
++                      Folder folder = getFolder(cursor==null ? rootFolderId : cursor.getId(), lastElement).getDTO();
                        if (ignoreDeleted && folder.isDeleted())
                                throw new ObjectNotFoundException("Resource not found");
                        resource = folder;