commit e5c871ab814093d24ba1fffcf0c84f4da97aa97f
author Carsten Ziegeler <cziegeler@apache.org> Wed Feb 16 16:29:33 2011 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Wed Feb 16 16:29:33 2011 +0000
tree 943ddbfdc220c5c52c5f49f6832ed7db930c4f5d
parent 9ed6d6f5c97062d4502474941bb978ea793414a6

FELIX-2843 : Parsing PID assumes last 4 chars are file extension

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1071303 13f79535-47bb-0310-9956-ffa450edef68

fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java

diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
index 8667cbd..e15451a 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
@@ -18,18 +18,9 @@
  */
 package org.apache.felix.fileinstall.internal;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.URI;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
 
 import org.apache.felix.cm.file.ConfigurationHandler;
 import org.apache.felix.fileinstall.ArtifactInstaller;
@@ -37,13 +28,8 @@
 import org.apache.felix.fileinstall.internal.Util.Logger;
 import org.apache.felix.utils.collections.DictionaryAsMap;
 import org.apache.felix.utils.properties.InterpolationHelper;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.cm.ConfigurationEvent;
-import org.osgi.service.cm.ConfigurationListener;
+import org.osgi.framework.*;
+import org.osgi.service.cm.*;
 
 /**
  * ArtifactInstaller for configurations.
@@ -270,7 +256,7 @@
 
     String[] parsePid(String path)
     {
-        String pid = path.substring(0, path.length() - 4);
+        String pid = path.substring(0, path.lastIndexOf('.'));
         int n = pid.indexOf('-');
         if (n > 0)
         {