[Pkg-owncloud-commits] [owncloud] 38/258: CRON call ends in null exception

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 994f36e498c865612973699894108f0cd693f486
Author: Oliver Kohl D.Sc <oliver at kohl.bz>
Date:   Thu Jul 24 13:46:40 2014 +0200

    CRON call ends in null exception
    
    [error] 4461#0: *186285 FastCGI sent in stderr: "PHP message
    : PHP Fatal error:  Call to a member function execute() on null in /var/www/ownc
    loud/cron.php on line 125" while reading response header from upstream, client:
    217.13.183.252, server: cloud.mycloud.com, request: "GET /cron.php HTTP/1.1", upstre
    am: "fastcgi://unix:/var/run/php5-fpm.sock:", host: "cloud.mycloud.com", referrer: "
    https://cloud.mycloud.com/"
---
 cron.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cron.php b/cron.php
index 4c86407..ba17c89 100644
--- a/cron.php
+++ b/cron.php
@@ -122,8 +122,11 @@ try {
 			// Work and success :-)
 			$jobList = \OC::$server->getJobList();
 			$job = $jobList->getNext();
-			$job->execute($jobList, $logger);
-			$jobList->setLastJob($job);
+			if ($job != null)
+			{
+				$job->execute($jobList, $logger);
+				$jobList->setLastJob($job);
+			}
 			OC_JSON::success();
 		}
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git