Resolved FELIX-2235 /Deployment plugin fails with internal server error/
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@927431 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java
index 323584d..c32920d 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/deppack/DepPackServlet.java
@@ -55,6 +55,8 @@
private static final String ACTION_UNINSTALL = "uninstalldp";
private static final String PARAMETER_PCK_FILE = "pckfile";
+ private static final String DEPL_SERVICE = DeploymentAdmin.class.getName();
+
// templates
private final String TEMPLATE;
@@ -81,7 +83,7 @@
if ( params != null )
{
final FileItem pck = getFileItem( params, PARAMETER_PCK_FILE, false );
- final DeploymentAdmin admin = ( DeploymentAdmin ) this.getService( DeploymentAdmin.class.getName() );
+ final DeploymentAdmin admin = ( DeploymentAdmin ) this.getService( DEPL_SERVICE );
if ( admin != null )
{
try
@@ -105,7 +107,7 @@
final String pckId = req.getPathInfo().substring( req.getPathInfo().lastIndexOf( '/' ) + 1 );
if ( pckId != null && pckId.length() > 0 )
{
- final DeploymentAdmin admin = ( DeploymentAdmin ) this.getService( DeploymentAdmin.class.getName() );
+ final DeploymentAdmin admin = ( DeploymentAdmin ) this.getService( DEPL_SERVICE );
if ( admin != null )
{
try
@@ -158,7 +160,7 @@
IOException
{
- final DeploymentAdmin admin = ( DeploymentAdmin ) this.getService( DeploymentAdmin.class.getName() );
+ final DeploymentAdmin admin = ( DeploymentAdmin ) this.getService( DEPL_SERVICE );
StringWriter w = new StringWriter();
PrintWriter w2 = new PrintWriter(w);