svn commit: r1520378 - in /cxf/branches/2.7.x-fixes: ./ distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java

[sergeyb]

Author: sergeyb
Date: Thu Sep  5 17:17:48 2013
New Revision: 1520378

URL: http://svn.apache.org/r1520378
Log:
Merged revisions 1519736 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1519736 | sergeyb | 2013-09-03 17:05:25 +0100 (Tue, 03 Sep 2013) | 1 line
  
  Fixing a checkstyle issue
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1519736

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java?rev=1520378&r1=1520377&r2=1520378&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
 Thu Sep  5 17:17:48 2013
@@ -29,7 +29,8 @@ public class SampleServlet extends CXFNo
     private static final long serialVersionUID = -1531317723099896635L;
 
     @Override
-    protected Application createApplicationInstance(String appClassName, 
ServletConfig servletConfig) {
+    protected Application createApplicationInstance(String appClassName, 
ServletConfig servletConfig) 
+        throws ServletException {
         return new SampleApplication();
     }