gCubeSystem
/
tabular-data-gwt-service
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@93404 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-03-20 18:35:10 +00:00
parent 9eb4a6a1aa
commit c973a5f7a3
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
View File

@ -230,6 +230,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
} }
logger.debug("GetTabResourceInformation():" + currentTR.toString()); logger.debug("GetTabResourceInformation():" + currentTR.toString());
if(currentTR.getTrId()==null){
logger.error("CURRENT_TABULAR_RESOURCE has TRId null");
throw new TDGWTServiceException(
"CURRENT_TABULAR_RESOURCE has TRId null");
}
ArrayList<TRMetadata> trMetadatas = getTRMetadata(currentTR ArrayList<TRMetadata> trMetadatas = getTRMetadata(currentTR
.getTrId()); .getTrId());
updateTabResourceInformation(currentTR, trMetadatas); updateTabResourceInformation(currentTR, trMetadatas);
@ -260,8 +266,15 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
@SuppressWarnings("unused") @SuppressWarnings("unused")
HttpSession session = this.getThreadLocalRequest().getSession(); HttpSession session = this.getThreadLocalRequest().getSession();
// ASLSession aslSession = SessionUtil.getAslSession(session); // ASLSession aslSession = SessionUtil.getAslSession(session);
logger.debug("GetTabResourceInformation(TRId):" + trId.toString()); if(trId==null){
logger.error("GetTabularREsourceInformation TRId is null");
throw new TDGWTServiceException(
"GetTabularREsourceInformation TRId is null");
}
logger.debug("GetTabResourceInformation:" + trId.toString());
TabResource currentTR = new TabResource(); TabResource currentTR = new TabResource();
currentTR.setTrId(trId);
ArrayList<TRMetadata> trMetadatas = getTRMetadata(currentTR ArrayList<TRMetadata> trMetadatas = getTRMetadata(currentTR
.getTrId()); .getTrId());
@ -1151,7 +1164,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try { try {
HttpSession session = this.getThreadLocalRequest().getSession(); HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session); ASLSession aslSession = SessionUtil.getAslSession(session);
logger.debug("GetTabularResources");
AuthorizationProvider.instance.set(new AuthorizationToken( AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername())); aslSession.getUsername()));
TabularDataService service = TabularDataServiceFactory.getService(); TabularDataService service = TabularDataServiceFactory.getService();
@ -1164,6 +1177,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
int i; int i;
for (i = 0; i < trs.size(); i++) { for (i = 0; i < trs.size(); i++) {
TabularResource tr = trs.get(i); TabularResource tr = trs.get(i);
logger.debug("GetTabularResources RetrieveMetadata");
try { try {
TabResource t = retrieveTRMetadataFromService(service, tr, TabResource t = retrieveTRMetadataFromService(service, tr,
i); i);
@ -2067,7 +2081,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
HttpSession session = this.getThreadLocalRequest().getSession(); HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session); ASLSession aslSession = SessionUtil.getAslSession(session);
logger.debug("GetTRMetadata on " + trId.toString()); logger.debug("GetTRMetadata on " + trId);
AuthorizationProvider.instance.set(new AuthorizationToken( AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername())); aslSession.getUsername()));
@ -3980,9 +3994,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
Table table = service.getLastTable(serviceTR); Table table = service.getLastTable(serviceTR);
TRId trId = new TRId( TRId trId = new TRId(
new Long(cloned.getId().getValue()).toString(), new Long( new Long(cloned.getId().getValue()).toString(),
table.getId().getValue()).toString()); cloned.getTableType(),
trId.setTableType(table.getTableType().getName()); new Long(
table.getId().getValue()).toString(), table.getTableType().getName());
TabResource tabResource = new TabResource(); TabResource tabResource = new TabResource();
tabResource.setTrId(trId); tabResource.setTrId(trId);