null check. For some reason delete is called twice

6b9c84d5 · Spiros Koulouzis · ced4d30b · 6b9c84d5 · 6b9c84d5 · 6b9c84d5
Commit 6b9c84d5 authored Jul 17, 2017 by Spiros Koulouzis
30 changed files
--- a/docs/apidocs/apidocs/downloads.html
+++ b/docs/apidocs/apidocs/downloads.html
@@ -121,7 +121,7 @@
    </tr>
    <tr class="clickable-row" data-href="drip-api-json-client-json-sources.jar">
      <td><span class="downloadfile-name">drip-api-json-client-json-sources.jar</span></td>
-      <td><span class="downloadfile-size">13.97K</span></td>
+      <td><span class="downloadfile-size">13.96K</span></td>
      <td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td>
    </tr>
    </tbody>
@@ -144,7 +144,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-xml-client.jar">
      <td><span class="downloadfile-name">drip-api-xml-client.jar</span></td>
-      <td><span class="downloadfile-size">24.60K</span></td>
+      <td><span class="downloadfile-size">24.59K</span></td>
      <td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td>
    </tr>
    <tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar">
@@ -184,7 +184,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-js.zip">
      <td><span class="downloadfile-name">drip-api-js.zip</span></td>
-      <td><span class="downloadfile-size">5.27K</span></td>
+      <td><span class="downloadfile-size">5.26K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>
@@ -213,7 +213,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-php.zip">
      <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">5.89K</span></td>
+      <td><span class="downloadfile-size">5.78K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>
@@ -245,7 +245,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-php.zip">
      <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">8.99K</span></td>
+      <td><span class="downloadfile-size">9.00K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>

--- a/docs/apidocs/apidocs/drip-api-gwt-json-overlay.jar
+++ b/docs/apidocs/apidocs/drip-api-gwt-json-overlay.jar
--- a/docs/apidocs/apidocs/drip-api-js.zip
+++ b/docs/apidocs/apidocs/drip-api-js.zip
--- a/docs/apidocs/apidocs/drip-api-json-client-json-sources.jar
+++ b/docs/apidocs/apidocs/drip-api-json-client-json-sources.jar
--- a/docs/apidocs/apidocs/drip-api-json-client.jar
+++ b/docs/apidocs/apidocs/drip-api-json-client.jar
--- a/docs/apidocs/apidocs/drip-api-php.zip
+++ b/docs/apidocs/apidocs/drip-api-php.zip
--- a/docs/apidocs/apidocs/drip-api-xml-client-xml-sources.jar
+++ b/docs/apidocs/apidocs/drip-api-xml-client-xml-sources.jar
--- a/docs/apidocs/apidocs/drip-api-xml-client.jar
+++ b/docs/apidocs/apidocs/drip-api-xml-client.jar
--- a/docs/apidocs/apidocs/drip-api.rb
+++ b/docs/apidocs/apidocs/drip-api.rb
--- a/docs/apidocs/apidocs/json_BenchmarkResult.html
+++ b/docs/apidocs/apidocs/json_BenchmarkResult.html
@@ -81,16 +81,16 @@ class</p>
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">host</span>
+          <td>  <span class="property-name">end</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">cloudDeploymentDomain</span>
+          <td>  <span class="property-name">host</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -99,7 +99,7 @@ class</p>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">delta</span>
+          <td>  <span class="property-name">start</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -108,27 +108,27 @@ class</p>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">vmType</span>
+          <td>  <span class="property-name">delta</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">end</span>
+          <td>  <span class="property-name">vmType</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">start</span>
+          <td>  <span class="property-name">cloudDeploymentDomain</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -165,12 +165,12 @@ object is saved.</span></td>
      <p class="lead">Example</p>
      <pre class="prettyprint language-js example">{
+  &quot;end&quot; : 12345,
  &quot;host&quot; : &quot;147.228.242.58&quot;,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
+  &quot;start&quot; : 12345,
  &quot;delta&quot; : 12345,
  &quot;vmType&quot; : &quot;...&quot;,
-  &quot;end&quot; : 12345,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
-  &quot;start&quot; : 12345,
  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;timestamp&quot; : 1499793079011

--- a/docs/apidocs/apidocs/json_OwnedObject.html
+++ b/docs/apidocs/apidocs/json_OwnedObject.html
@@ -69,7 +69,7 @@ class</p>
      <dl class="dl-horizontal">
        <dt>Subtypes</dt>
-        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd>
+        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd>
      </dl>
      <table class="table datatype-properties">

--- a/docs/apidocs/apidocs/ns0.xsd
+++ b/docs/apidocs/apidocs/ns0.xsd
@@ -804,17 +804,17 @@ class]]>
   <xs:complexContent>
    <xs:extension base="ownedObject">
      <xs:sequence>
-              <xs:element name="start" type="xs:dateTime" minOccurs="0">
+              <xs:element name="end" type="xs:dateTime" minOccurs="0">
              </xs:element>
-              <xs:element name="host" type="xs:string" minOccurs="0">
+              <xs:element name="vmType" type="xs:string" minOccurs="0">
              </xs:element>
-              <xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
+              <xs:element name="delta" type="xs:dateTime" minOccurs="0">
              </xs:element>
-              <xs:element name="vmType" type="xs:string" minOccurs="0">
+              <xs:element name="start" type="xs:dateTime" minOccurs="0">
              </xs:element>
-              <xs:element name="end" type="xs:dateTime" minOccurs="0">
+              <xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
              </xs:element>
-              <xs:element name="delta" type="xs:dateTime" minOccurs="0">
+              <xs:element name="host" type="xs:string" minOccurs="0">
              </xs:element>
      </xs:sequence>
    </xs:extension>

--- a/docs/apidocs/apidocs/resource_BenchmarkController.html
+++ b/docs/apidocs/apidocs/resource_BenchmarkController.html
@@ -144,12 +144,12 @@ Content-Type: application/json
                <code class="prettyprint language-js">
 [ {
+  &quot;end&quot; : 12345,
  &quot;host&quot; : &quot;147.228.242.58&quot;,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
+  &quot;start&quot; : 12345,
  &quot;delta&quot; : 12345,
  &quot;vmType&quot; : &quot;...&quot;,
-  &quot;end&quot; : 12345,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
-  &quot;start&quot; : 12345,
  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;timestamp&quot; : 1499793079011
@@ -514,12 +514,12 @@ Content-Type: application/json
                <code class="prettyprint language-js">
 {
+  &quot;end&quot; : 12345,
  &quot;host&quot; : &quot;147.228.242.58&quot;,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
+  &quot;start&quot; : 12345,
  &quot;delta&quot; : 12345,
  &quot;vmType&quot; : &quot;...&quot;,
-  &quot;end&quot; : 12345,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
-  &quot;start&quot; : 12345,
  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;timestamp&quot; : 1499793079011

--- a/docs/apidocs/apidocs/xml_ns0_benchmarkResult.html
+++ b/docs/apidocs/apidocs/xml_ns0_benchmarkResult.html
@@ -231,12 +231,12 @@ the DAO saves the object based on the principal how made the call</span></td>
      <p class="lead">Example</p>
      <pre class="prettyprint language-xml example">&lt;b-----&gt;
-  &lt;start&gt;...&lt;/start&gt;
-  &lt;host&gt;147.228.242.58&lt;/host&gt;
-  &lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
-  &lt;vmType&gt;...&lt;/vmType&gt;
  &lt;end&gt;...&lt;/end&gt;
+  &lt;vmType&gt;...&lt;/vmType&gt;
  &lt;delta&gt;...&lt;/delta&gt;
+  &lt;start&gt;...&lt;/start&gt;
+  &lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
+  &lt;host&gt;147.228.242.58&lt;/host&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;1499793079011&lt;/timestamp&gt;
 &lt;/b-----&gt;

--- a/docs/apidocs/downloads.html
+++ b/docs/apidocs/downloads.html
@@ -121,7 +121,7 @@
    </tr>
    <tr class="clickable-row" data-href="drip-api-json-client-json-sources.jar">
      <td><span class="downloadfile-name">drip-api-json-client-json-sources.jar</span></td>
-      <td><span class="downloadfile-size">13.97K</span></td>
+      <td><span class="downloadfile-size">13.96K</span></td>
      <td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td>
    </tr>
    </tbody>
@@ -144,7 +144,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-xml-client.jar">
      <td><span class="downloadfile-name">drip-api-xml-client.jar</span></td>
-      <td><span class="downloadfile-size">24.60K</span></td>
+      <td><span class="downloadfile-size">24.59K</span></td>
      <td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td>
    </tr>
    <tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar">
@@ -184,7 +184,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-js.zip">
      <td><span class="downloadfile-name">drip-api-js.zip</span></td>
-      <td><span class="downloadfile-size">5.27K</span></td>
+      <td><span class="downloadfile-size">5.26K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>
@@ -213,7 +213,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-php.zip">
      <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">5.89K</span></td>
+      <td><span class="downloadfile-size">5.78K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>
@@ -245,7 +245,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-php.zip">
      <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">8.99K</span></td>
+      <td><span class="downloadfile-size">9.00K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>

--- a/docs/apidocs/drip-api-gwt-json-overlay.jar
+++ b/docs/apidocs/drip-api-gwt-json-overlay.jar
--- a/docs/apidocs/drip-api-js.zip
+++ b/docs/apidocs/drip-api-js.zip
--- a/docs/apidocs/drip-api-json-client-json-sources.jar
+++ b/docs/apidocs/drip-api-json-client-json-sources.jar
--- a/docs/apidocs/drip-api-json-client.jar
+++ b/docs/apidocs/drip-api-json-client.jar
--- a/docs/apidocs/drip-api-php.zip
+++ b/docs/apidocs/drip-api-php.zip
--- a/docs/apidocs/drip-api-xml-client-xml-sources.jar
+++ b/docs/apidocs/drip-api-xml-client-xml-sources.jar
--- a/docs/apidocs/drip-api-xml-client.jar
+++ b/docs/apidocs/drip-api-xml-client.jar
--- a/docs/apidocs/drip-api.rb
+++ b/docs/apidocs/drip-api.rb
--- a/docs/apidocs/json_BenchmarkResult.html
+++ b/docs/apidocs/json_BenchmarkResult.html
@@ -81,9 +81,9 @@ class</p>
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">vmType</span>
+          <td>  <span class="property-name">start</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -108,7 +108,7 @@ class</p>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">cloudDeploymentDomain</span>
+          <td>  <span class="property-name">host</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -117,16 +117,16 @@ class</p>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">start</span>
+          <td>  <span class="property-name">cloudDeploymentDomain</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">host</span>
+          <td>  <span class="property-name">vmType</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -165,12 +165,12 @@ object is saved.</span></td>
      <p class="lead">Example</p>
      <pre class="prettyprint language-js example">{
-  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;start&quot; : 12345,
  &quot;end&quot; : 12345,
  &quot;delta&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
-  &quot;start&quot; : 12345,
  &quot;host&quot; : &quot;147.228.242.58&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
+  &quot;vmType&quot; : &quot;...&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;timestamp&quot; : 1499793079011

--- a/docs/apidocs/json_OwnedObject.html
+++ b/docs/apidocs/json_OwnedObject.html
@@ -69,7 +69,7 @@ class</p>
      <dl class="dl-horizontal">
        <dt>Subtypes</dt>
-        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd>
+        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd>
      </dl>
      <table class="table datatype-properties">

--- a/docs/apidocs/ns0.xsd
+++ b/docs/apidocs/ns0.xsd
@@ -804,17 +804,17 @@ class]]>
   <xs:complexContent>
    <xs:extension base="ownedObject">
      <xs:sequence>
-              <xs:element name="vmType" type="xs:string" minOccurs="0">
-              </xs:element>
              <xs:element name="delta" type="xs:dateTime" minOccurs="0">
              </xs:element>
-              <xs:element name="end" type="xs:dateTime" minOccurs="0">
+              <xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
              </xs:element>
              <xs:element name="host" type="xs:string" minOccurs="0">
              </xs:element>
+              <xs:element name="end" type="xs:dateTime" minOccurs="0">
+              </xs:element>
              <xs:element name="start" type="xs:dateTime" minOccurs="0">
              </xs:element>
-              <xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
+              <xs:element name="vmType" type="xs:string" minOccurs="0">
              </xs:element>
      </xs:sequence>
    </xs:extension>

--- a/docs/apidocs/resource_BenchmarkController.html
+++ b/docs/apidocs/resource_BenchmarkController.html
@@ -144,12 +144,12 @@ Content-Type: application/json
                <code class="prettyprint language-js">
 [ {
-  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;start&quot; : 12345,
  &quot;end&quot; : 12345,
  &quot;delta&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
-  &quot;start&quot; : 12345,
  &quot;host&quot; : &quot;147.228.242.58&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
+  &quot;vmType&quot; : &quot;...&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;timestamp&quot; : 1499793079011
@@ -514,12 +514,12 @@ Content-Type: application/json
                <code class="prettyprint language-js">
 {
-  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;start&quot; : 12345,
  &quot;end&quot; : 12345,
  &quot;delta&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
-  &quot;start&quot; : 12345,
  &quot;host&quot; : &quot;147.228.242.58&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
+  &quot;vmType&quot; : &quot;...&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;timestamp&quot; : 1499793079011

--- a/docs/apidocs/xml_ns0_benchmarkResult.html
+++ b/docs/apidocs/xml_ns0_benchmarkResult.html
@@ -231,12 +231,12 @@ the DAO saves the object based on the principal how made the call</span></td>
      <p class="lead">Example</p>
      <pre class="prettyprint language-xml example">&lt;b-----&gt;
-  &lt;vmType&gt;...&lt;/vmType&gt;
  &lt;delta&gt;...&lt;/delta&gt;
-  &lt;end&gt;...&lt;/end&gt;
+  &lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
  &lt;host&gt;147.228.242.58&lt;/host&gt;
+  &lt;end&gt;...&lt;/end&gt;
  &lt;start&gt;...&lt;/start&gt;
-  &lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
+  &lt;vmType&gt;...&lt;/vmType&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;1499793079011&lt;/timestamp&gt;
 &lt;/b-----&gt;

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
@@ -108,7 +108,9 @@ public class ProvisionService {
    @PostAuthorize("(returnObject.owner == authentication.name) or (hasRole('ROLE_ADMIN'))")
    public ProvisionResponse delete(String id) {
        ProvisionResponse provisionInfo = provisionDao.findOne(id);
-        provisionDao.delete(provisionInfo);
+        if (provisionInfo != null) {
+            provisionDao.delete(provisionInfo);
+        }
        return provisionInfo;
    }

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ProvisionController.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ProvisionController.java
@@ -189,7 +189,8 @@ public class ProvisionController {
        return resp.getId();
    }
-        @RequestMapping(value = "/scale", method = RequestMethod.POST)
+    @RequestMapping(value = "/scale", method = RequestMethod.POST)
    @RolesAllowed({UserService.USER, UserService.ADMIN})
    public @ResponseBody
    String scaleDeployment(@RequestBody ScaleRequest scaleRequest) {