Anonymous avatar Anonymous committed d551017

bug fixes

Comments (0)

Files changed (1)

gazebo/common/ModelDatabase.cc

   size_t size = 0;
 
   {
-    boost::mutex::scoped_try_lock tryLock(this->updateMutex);
-    if (!tryLock)
-      gzmsg << "Waiting for model database update to complete...\n";
+    {
+      boost::mutex::scoped_try_lock tryLock(this->updateMutex);
+      if (!tryLock)
+        gzmsg << "Waiting for model database update to complete...\n";
+    }
 
     boost::mutex::scoped_lock lock(this->updateMutex);
     size = this->modelCache.size();
       endIndex - startIndex;
 
     std::string modelName = _uri.substr(startIndex, modelNameLen);
-    suffix = _uri.substr(endIndex, std::string::npos);
+    if(endIndex != std::string::npos)
+      suffix = _uri.substr(endIndex, std::string::npos);
 
     // store zip file in temp location
     std::string filename = "/tmp/gz_model.tar.gz";
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.