You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/11/15 20:34:41 UTC
svn commit: r1846678 - in /webservices/axiom/branches/1.2.x: ./
axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/LifecycleManagerImpl.java
Author: veithen
Date: Thu Nov 15 20:34:40 2018
New Revision: 1846678
URL: http://svn.apache.org/viewvc?rev=1846678&view=rev
Log:
AXIOM-493: Merge r1846677 to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/LifecycleManagerImpl.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 15 20:34:40 2018
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1826041,1843069,1843073,1843075,1843517,1844631,1845037,1845623,1846359,1846362,1846368
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1826041,1843069,1843073,1843075,1843517,1844631,1845037,1845623,1846359,1846362,1846368,1846677
Modified: webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/LifecycleManagerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/LifecycleManagerImpl.java?rev=1846678&r1=1846677&r2=1846678&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/LifecycleManagerImpl.java (original)
+++ webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/LifecycleManagerImpl.java Thu Nov 15 20:34:40 2018
@@ -86,7 +86,7 @@ public class LifecycleManagerImpl implem
}
if(file!=null && file.exists()){
- table.remove(file);
+ table.remove(file.getName());
if(log.isDebugEnabled()){
log.debug("invoking file.delete()");
}
@@ -132,7 +132,7 @@ public class LifecycleManagerImpl implem
log.debug("Invoking deleteOnExit() for file = "+file.getAbsolutePath());
}
hook.add(file);
- table.remove(file);
+ table.remove(file.getName());
}
if(log.isDebugEnabled()){
log.debug("End deleteOnExit()");
@@ -197,7 +197,7 @@ public class LifecycleManagerImpl implem
try{
Thread.sleep(interval*1000);
if(_file.exists()){
- table.remove(_file);
+ table.remove(_file.getName());
_file.delete();
}
}catch(InterruptedException e){