1 files changed, 16 insertions, 10 deletions
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java
index c365a1121..76be8217a 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/timer/TSLUpdaterTimerTask.java
@@ -33,6 +33,7 @@ import at.gv.egovernment.moa.spss.server.iaik.pki.store.truststore.TrustStorePro
 import at.gv.egovernment.moa.spss.server.logging.TransactionId;
 import at.gv.egovernment.moa.spss.tsl.connector.TSLConnector;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
+import at.gv.egovernment.moa.util.FileUtils;
 import at.gv.egovernment.moa.util.StringUtils;
 
 
@@ -130,7 +131,14 @@ public class TSLUpdaterTimerTask extends TimerTask {
 					// create store updater for each TSL enabled truststore 
 					Logger.debug(new LogMsg(msg.getMessage("config.45", null)));
 					StoreUpdater storeUpdater = new StoreUpdater(certStoreParameters, trustStoreProfiles, tid);
+					
 		            
+					// delete files in trustprofile
+					File ftp = new File(tp.getUri());
+					File[] files = ftp.listFiles();
+					for (File file : files) 
+			              file.delete();   
+					
 					// convert ArrayList<File> to X509Certificate[]										
 					X509Certificate[] addCertificates = new X509Certificate[tsl_certs.size()];
 					Iterator itcert = tsl_certs.iterator();
@@ -143,20 +151,18 @@ public class TSLUpdaterTimerTask extends TimerTask {
 						i++;
 					}
 					
-					// get certificates to be removed
-					X509Certificate[] removeCertificates = tp.getCertficatesToBeRemoved();
-					
-										
-					//Logger.debug(new LogMsg(msg.getMessage("config.44", null)));	
-					Logger.debug(new LogMsg("Remove " + removeCertificates.length + " certificates."));
-					storeUpdater.removeCertificatesFromTrustStores(removeCertificates, tid);
-					
 					
+					// copy files from original trustAnchorsLocURI into tslworking trust profile
+			    	File src = new File(tp.getUriOrig());
+			    	files = src.listFiles();                    
+			        for (File file : files) { 
+			            FileUtils.copyFile(file, new File(tp.getUri(), file.getName()));  
+			        } 
+			          
 					Logger.debug(new LogMsg("Add " + addCertificates.length + " certificates."));
 					storeUpdater.addCertificatesToTrustStores(addCertificates, tid);
+					storeUpdater.addCertificatesToCertStores(addCertificates, tid);
 		
-					// set the certifcates to be removed for the next TSL update
-					tp.setCertificatesToBeRemoved(addCertificates);
 		            
 				}
 			}